portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r729327 [2/2] - in /portals/jetspeed-2/portal/trunk: ./ jetspeed-ant-tasks/ jetspeed-installer/ jetspeed-installer/etc/ant-installer/ jetspeed-installer/etc/database/ maven/jetspeed-mvn-maven-plugin/src/main/java/org/apache/jetspeed/maven/p...
Date Wed, 24 Dec 2008 16:05:34 GMT
Added: portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml?rev=729327&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
(added)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
Wed Dec 24 08:05:34 2008
@@ -0,0 +1,526 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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>
+  <prerequisites>
+    <maven>2.0.9</maven>
+  </prerequisites>
+
+  <artifactId>jetspeed-mvn-tomcat-portal-pom</artifactId>
+  <name>Jetspeed-2 Maven Invoker Configuration for installer's Tomcat Portal</name>
+  <description>Jetspeed-2 Maven Invoker Configuration for installer's Tomcat Portal</description>
+  <parent>
+    <groupId>org.apache.portals.jetspeed-2</groupId>
+    <artifactId>jetspeed-2</artifactId>
+    <version>2.2-SNAPSHOT</version>
+  </parent>
+
+  <packaging>pom</packaging>
+
+  <properties>
+    <org.apache.portals.jetspeed.version>${pom.version}</org.apache.portals.jetspeed.version>
+    <org.apache.jetspeed.portal.context.name>jetspeed</org.apache.jetspeed.portal.context.name>
+    <tomcat.version>apache-tomcat-5.5.27</tomcat.version>
+    <org.apache.jetspeed.portal.home>${project.build.directory}/${tomcat.version}</org.apache.jetspeed.portal.home>
+  </properties>
+
+  <build>
+    <defaultGoal>process-resources</defaultGoal>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>unpack</id>
+      <build>
+        <defaultGoal>package</defaultGoal>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.2</version>
+            <executions>
+              <!-- get tomcat zip file remotely and expand to target/tomcat-portal  -->
+              <execution>
+                <id>get-unpacked-tomcat</id>
+                <phase>generate-resources</phase>
+                <configuration>
+                  <tasks>
+                    <mkdir dir="resources"/>
+                    <get usetimestamp="true"
+                      src="http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.27/bin/${tomcat.version}.zip"
+                      dest="resources/${tomcat.version}.zip"/>
+                    <unzip src="resources/${tomcat.version}.zip" dest="${project.build.directory}"
+                      overwrite="false"/>
+
+                    <delete dir="${org.apache.jetspeed.portal.home}/webapps/balancer"/>
+                    <delete dir="${org.apache.jetspeed.portal.home}/webapps/jsp-examples"/>
+                    <delete dir="${org.apache.jetspeed.portal.home}/webapps/servlets-examples"/>
+                    <delete dir="${org.apache.jetspeed.portal.home}/webapps/tomcat-docs"/>
+                    <delete dir="${org.apache.jetspeed.portal.home}/webapps/webdav"/>
+                  </tasks>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+
+          <!-- extract needed resources from the portal-resources artifact -->
+          <plugin>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-unpack-maven-plugin</artifactId>
+            <version>${org.apache.portals.jetspeed.version}</version>
+            <executions>
+              <execution>
+                <id>unpack-portal-resources</id>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <phase>generate-resources</phase>
+                <configuration>
+                  <unpack>
+                    <artifact>org.apache.portals.jetspeed-2:jetspeed-portal-resources:jar</artifact>
+                    <resources>
+                      <resource>
+                        <path>conf</path>
+                        <include>tomcat/context.xml</include>
+                        <destination>resources</destination>
+                      </resource>
+                    </resources>
+                  </unpack>
+                </configuration>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-portal-resources</artifactId>
+                <version>${org.apache.portals.jetspeed.version}</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>minimal</id>
+      <build>
+        <defaultGoal>package</defaultGoal>
+
+        <!-- create a minimal jetspeed deployment into the expanded tomcat -->
+        <plugins>
+          <plugin>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-deploy-maven-plugin</artifactId>
+            <version>${org.apache.portals.jetspeed.version}</version>
+            <executions>
+              <execution>
+                <id>deploy</id>
+                <goals>
+                  <goal>deploy</goal>
+                </goals>
+                <phase>generate-resources</phase>
+                <configuration>
+                  <targetBaseDir>${org.apache.jetspeed.portal.home}</targetBaseDir>
+                  <portalName>${org.apache.jetspeed.portal.context.name}</portalName>
+                  <destinations>
+                    <context>webapps/jetspeed/META-INF</context>
+                  </destinations>
+                  <deployments>
+                    <deployment>
+                      <artifact>javax.portlet:portlet-api:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>javax.ccpp:ccpp:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.portals.jetspeed-2:jetspeed-api:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.portals.jetspeed-2:jetspeed-commons:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.pluto:pluto-container-api:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.pluto:pluto-taglib:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.portals.bridges:portals-bridges-common:jar</artifact>
+                    </deployment>
+                    <!-- jetspeed portal expanded -->
+                    <deployment>
+                      <artifact>org.apache.portals.jetspeed-2:jetspeed-demo:war</artifact>
+                      <expand>true</expand>
+                      <targetName>${org.apache.jetspeed.portal.context.name}</targetName>
+                      <delete>./${org.apache.jetspeed.portal.context.name}</delete>
+                    </deployment>
+                    <!-- demo portal tomcat context -->
+                    <deployment>
+                      <file>${project.build.directory}/resources/tomcat/context.xml</file>
+                      <destination>context</destination>
+                    </deployment>
+                    <!-- admin pa -->
+                    <deployment>
+                      <artifact>org.apache.portals.jetspeed-2:j2-admin:war</artifact>
+                      <expand>true</expand>
+                      <delete>./j2-admin</delete>
+                    </deployment>
+                  </deployments>
+                </configuration>
+              </execution>
+            </executions>
+
+            <dependencies>
+
+              <dependency>
+                <groupId>javax.portlet</groupId>
+                <artifactId>portlet-api</artifactId>
+                <version>${portlet-api.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>javax.ccpp</groupId>
+                <artifactId>ccpp</artifactId>
+                <version>${ccpp.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-api</artifactId>
+                <version>${org.apache.portals.jetspeed.version}</version>
+                <scope>runtime</scope>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-commons</artifactId>
+                <version>${org.apache.portals.jetspeed.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.pluto</groupId>
+                <artifactId>pluto-container-api</artifactId>
+                <version>${org.apache.pluto.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.pluto</groupId>
+                <artifactId>pluto-taglib</artifactId>
+                <version>${org.apache.pluto.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.portals.bridges</groupId>
+                <artifactId>portals-bridges-common</artifactId>
+                <version>${org.apache.portals.bridges.common.version}</version>
+              </dependency>
+              <!-- jetspeed-demo -->
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-demo</artifactId>
+                <version>${pom.version}</version>
+                <type>war</type>
+              </dependency>
+              <!-- j2-admin -->
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>j2-admin</artifactId>
+                <version>${org.apache.portals.jetspeed.version}</version>
+                <type>war</type>
+              </dependency>
+
+              <!-- plugin own dependencies -->
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-deploy-tools</artifactId>
+                <version>${org.apache.portals.jetspeed.version}</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+
+          <!-- remove pages and move min-pages to pages -->
+          <plugin>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-fileutils-maven-plugin</artifactId>
+            <version>${org.apache.portals.jetspeed.version}</version>
+            <executions>
+              <execution>
+                <id>delete-pages</id>
+                <goals>
+                  <goal>event</goal>
+                </goals>
+                <phase>process-resources</phase>
+                <configuration>
+                  <srcDirectoryPath>${org.apache.jetspeed.portal.home}/webapps/${org.apache.jetspeed.portal.context.name}/WEB-INF/pages</srcDirectoryPath>
+                  <event>delete</event>
+                </configuration>
+              </execution>
+              <execution>
+                <id>move-min-pages</id>
+                <goals>
+                  <goal>event</goal>
+                </goals>
+                <phase>process-resources</phase>
+                <configuration>
+                  <srcDirectoryPath>${org.apache.jetspeed.portal.home}/webapps/${org.apache.jetspeed.portal.context.name}/WEB-INF/min-pages</srcDirectoryPath>
+                  <destDirectoryPath>${org.apache.jetspeed.portal.home}/webapps/${org.apache.jetspeed.portal.context.name}/WEB-INF/pages</destDirectoryPath>
+                  <event>move</event>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>demo</id>
+      <build>
+        <defaultGoal>package</defaultGoal>
+        <plugins>
+          <!-- create a demo jetspeed deployment into the expanded tomcat -->
+          <plugin>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-deploy-maven-plugin</artifactId>
+            <version>${org.apache.portals.jetspeed.version}</version>
+            <executions>
+              <execution>
+                <id>deploy</id>
+                <goals>
+                  <goal>deploy</goal>
+                </goals>
+                <phase>generate-resources</phase>
+                <configuration>
+                  <targetBaseDir>${org.apache.jetspeed.portal.home}</targetBaseDir>
+                  <portalName>${org.apache.jetspeed.portal.context.name}</portalName>
+                  <destinations>
+                    <context>webapps/jetspeed/META-INF</context>
+                  </destinations>
+                  <deployments>
+                    <deployment>
+                      <artifact>javax.portlet:portlet-api:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>javax.ccpp:ccpp:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.portals.jetspeed-2:jetspeed-api:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.portals.jetspeed-2:jetspeed-commons:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.pluto:pluto-container-api:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.pluto:pluto-taglib:jar</artifact>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.portals.bridges:portals-bridges-common:jar</artifact>
+                    </deployment>
+                    <!-- jetspeed portal expanded -->
+                    <deployment>
+                      <artifact>org.apache.portals.jetspeed-2:jetspeed-demo:war</artifact>
+                      <expand>true</expand>
+                      <targetName>${org.apache.jetspeed.portal.context.name}</targetName>
+                      <delete>./${org.apache.jetspeed.portal.context.name}</delete>
+                    </deployment>
+                    <!-- demo portal tomcat context -->
+                    <deployment>
+                      <file>${project.build.directory}/resources/tomcat/context.xml</file>
+                      <destination>context</destination>
+                    </deployment>
+                    <!-- admin pa -->
+                    <deployment>
+                      <artifact>org.apache.portals.jetspeed-2:j2-admin:war</artifact>
+                      <expand>true</expand>
+                      <delete>./j2-admin</delete>
+                    </deployment>
+                    <!-- demo pa's, not for minimal! -->
+                    <deployment>
+                      <artifact>org.apache.portals.applications:demo:war</artifact>
+                      <expand>true</expand>
+                      <infuse>true</infuse>
+                      <delete>./demo</delete>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.portals.applications:rss:war</artifact>
+                      <infuse>true</infuse>
+                      <expand>true</expand>
+                      <delete>./rss</delete>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.portals.bridges:jpetstore:war</artifact>
+                      <infuse>true</infuse>
+                      <expand>true</expand>
+                      <delete>./jpetstore</delete>
+                    </deployment>
+                    <deployment>
+                      <artifact>org.apache.portals.bridges:jsf-demo:war</artifact>
+                      <infuse>true</infuse>
+                      <expand>true</expand>
+                      <delete>./jsf-demo</delete>
+                    </deployment>
+                  </deployments>
+                </configuration>
+              </execution>
+            </executions>
+
+            <dependencies>
+              <dependency>
+                <groupId>javax.portlet</groupId>
+                <artifactId>portlet-api</artifactId>
+                <version>${portlet-api.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>javax.ccpp</groupId>
+                <artifactId>ccpp</artifactId>
+                <version>${ccpp.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-api</artifactId>
+                <version>${org.apache.portals.jetspeed.version}</version>
+                <scope>runtime</scope>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-commons</artifactId>
+                <version>${org.apache.portals.jetspeed.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.pluto</groupId>
+                <artifactId>pluto-container-api</artifactId>
+                <version>${org.apache.pluto.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.pluto</groupId>
+                <artifactId>pluto-taglib</artifactId>
+                <version>${org.apache.pluto.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.portals.bridges</groupId>
+                <artifactId>portals-bridges-common</artifactId>
+                <version>${org.apache.portals.bridges.common.version}</version>
+              </dependency>
+              <!-- jetspeed-demo -->
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-demo</artifactId>
+                <version>${pom.version}</version>
+                <type>war</type>
+              </dependency>
+              <!-- j2-admin -->
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>j2-admin</artifactId>
+                <version>${org.apache.portals.jetspeed.version}</version>
+                <type>war</type>
+              </dependency>
+
+              <!-- demo pa's, not for minimal! -->
+              <dependency>
+                <groupId>org.apache.portals.applications</groupId>
+                <artifactId>demo</artifactId>
+                <version>${org.apache.portals.jetspeed.version}</version>
+                <type>war</type>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.portals.applications</groupId>
+                <artifactId>rss</artifactId>
+                <version>${org.apache.portals.jetspeed.version}</version>
+                <type>war</type>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.portals.bridges</groupId>
+                <artifactId>jsf-demo</artifactId>
+                <version>1.0.4</version>
+                <type>war</type>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.portals.bridges</groupId>
+                <artifactId>jpetstore</artifactId>
+                <version>1.0.4</version>
+                <type>war</type>
+              </dependency>
+
+              <!-- plugin own dependencies -->
+              <dependency>
+                <groupId>org.apache.portals.jetspeed-2</groupId>
+                <artifactId>jetspeed-deploy-tools</artifactId>
+                <version>${org.apache.portals.jetspeed.version}</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+
+          <!-- remove min-pages from deployed jetspeed -->
+          <plugin>
+            <groupId>org.apache.portals.jetspeed-2</groupId>
+            <artifactId>jetspeed-fileutils-maven-plugin</artifactId>
+            <version>${org.apache.portals.jetspeed.version}</version>
+            <executions>
+              <execution>
+                <id>delete-min-pages</id>
+                <goals>
+                  <goal>event</goal>
+                </goals>
+                <phase>process-resources</phase>
+                <configuration>
+                  <srcDirectoryPath>${org.apache.jetspeed.portal.home}/webapps/${org.apache.jetspeed.portal.context.name}/WEB-INF/min-pages</srcDirectoryPath>
+                  <event>delete</event>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <!-- pack: zip tomcat-portal -->
+    <profile>
+      <id>pack</id>
+      <build>
+        <defaultGoal>package</defaultGoal>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>zip-tomcat-portal</id>
+                <phase>package</phase>
+                <configuration>
+                  <descriptors>
+                    <descriptor>zip-tomcat-portal-descriptor.xml</descriptor>
+                  </descriptors>
+                  <finalName>tomcat-portal</finalName>
+                  <appendAssemblyId>false</appendAssemblyId>
+                </configuration>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-installer/jetspeed-mvn-tomcat-portal-pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml?rev=729327&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml (added)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml Wed Dec 24 08:05:34 2008
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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>
+  <prerequisites>
+    <maven>2.0.9</maven>
+  </prerequisites>
+
+  <artifactId>jetspeed-installer-pom</artifactId>
+  <name>Jetspeed-2 Installer</name>
+  <parent>
+    <groupId>org.apache.portals.jetspeed-2</groupId>
+    <artifactId>jetspeed-2</artifactId>
+    <version>2.2-SNAPSHOT</version>
+  </parent>
+
+  <build>
+    <pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <artifactId>jetspeed-mvn-maven-plugin</artifactId>
+        <version>${pom.version}</version>
+        <configuration>
+          <targets combine.children="append">
+            <target>
+              <id>clean</id>
+              <dir>./</dir>
+              <goals>clean</goals>
+            </target>
+            <target>
+              <id>database-minimal</id>
+              <name>database</name>
+              <properties>
+                <seed.path>seed/min</seed.path>
+              </properties>
+            </target>
+            <target>
+              <id>database-demo</id>
+              <name>database</name>
+              <properties>
+                <seed.path>seed</seed.path>
+              </properties>
+            </target>
+            <target>
+              <id>tomcat-portal-unpack</id>
+              <name>tomcat-portal</name>
+              <profiles>unpack</profiles>
+            </target>
+            <target>
+              <id>tomcat-portal-minimal</id>
+              <name>tomcat-portal</name>
+              <profiles>minimal</profiles>
+            </target>
+            <target>
+              <id>tomcat-portal-demo</id>
+              <name>tomcat-portal</name>
+              <profiles>demo</profiles>
+            </target>
+            <target>
+              <id>tomcat-portal-pack</id>
+              <name>tomcat-portal</name>
+              <profiles>pack</profiles>
+            </target>
+            <target>
+              <id>ant-installer-demo</id>
+              <name>ant-installer</name>
+              <profiles>demo</profiles>
+              <properties>
+                <antinstall.filename>antinstall-config.xml</antinstall.filename>
+              </properties>
+            </target>
+            <target>
+              <id>ant-installer-minimal</id>
+              <name>ant-installer</name>
+              <profiles>minimal</profiles>
+              <properties>
+                <antinstall.filename>antinstall-config-min.xml</antinstall.filename>
+              </properties>
+            </target>
+            <target>
+              <id>installer-demo</id>
+              <depends>clean,database-demo,tomcat-portal-unpack,tomcat-portal-demo,tomcat-portal-pack,ant-installer-demo</depends>
+            </target>
+            <target>
+              <id>installer-minimal</id>
+              <depends>clean,database-minimal,tomcat-portal-unpack,tomcat-portal-minimal,tomcat-portal-pack,ant-installer-minimal</depends>
+            </target>
+          </targets>
+        </configuration>
+      </plugin>
+
+    </plugins>
+    </pluginManagement>
+  </build>
+
+</project>

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

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-installer/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/portal/trunk/jetspeed-installer/zip-database-descriptor.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/zip-database-descriptor.xml?rev=729327&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/zip-database-descriptor.xml (added)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/zip-database-descriptor.xml Wed Dec
24 08:05:34 2008
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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$
+-->
+<assembly xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/xsd/assembly-1.0.0.xsd">
+  <id>zip-database</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <dependencySets>
+    <dependencySet>
+      <useProjectArtifact>false</useProjectArtifact>
+      <outputDirectory>database/lib</outputDirectory>
+    </dependencySet>
+  </dependencySets>
+  <fileSets>
+    <fileSet>
+      <directory>target/database</directory>
+      <outputDirectory>database</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-installer/zip-database-descriptor.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-installer/zip-database-descriptor.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-installer/zip-database-descriptor.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: portals/jetspeed-2/portal/trunk/jetspeed-installer/zip-tomcat-portal-descriptor.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-installer/zip-tomcat-portal-descriptor.xml?rev=729327&view=auto
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-installer/zip-tomcat-portal-descriptor.xml (added)
+++ portals/jetspeed-2/portal/trunk/jetspeed-installer/zip-tomcat-portal-descriptor.xml Wed
Dec 24 08:05:34 2008
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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$
+-->
+<assembly xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/xsd/assembly-1.0.0.xsd">
+  <id>zip-tomcat-portal</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>target/${tomcat.version}</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-installer/zip-tomcat-portal-descriptor.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-installer/zip-tomcat-portal-descriptor.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-installer/zip-tomcat-portal-descriptor.xml
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: portals/jetspeed-2/portal/trunk/maven/jetspeed-mvn-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/MvnMojo.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/maven/jetspeed-mvn-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/MvnMojo.java?rev=729327&r1=729326&r2=729327&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/maven/jetspeed-mvn-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/MvnMojo.java
(original)
+++ portals/jetspeed-2/portal/trunk/maven/jetspeed-mvn-maven-plugin/src/main/java/org/apache/jetspeed/maven/plugins/MvnMojo.java
Wed Dec 24 08:05:34 2008
@@ -197,6 +197,7 @@
             
             for (Target t : targets)
             {
+                System.out.println("Processing target: "+t);
                 t.init();
                 if (t.id == null)
                 {
@@ -208,7 +209,7 @@
                 }                
                 if (targetsMap.containsKey(t.id))
                 {
-                    throw new MojoFailureException("Duplicate target id (or derived from
its name): "+t.id);
+                    throw new MojoFailureException("Duplicate target id (or derived from
its name): "+t.id + "("+targetsMap+")");                    
                 }
                 if (t.dir != null)
                 {

Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=729327&r1=729326&r2=729327&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Wed Dec 24 08:05:34 2008
@@ -251,7 +251,7 @@
     </org.apache.jetspeed.test.jdbc.driver.version>
 
     <!-- Build Dependency Version Properties -->
-    <ant.version>1.7</ant.version>
+    <ant.version>1.7.1</ant.version>
     <jmock.version>1.2.0</jmock.version>
     <jmock-cglib.version>1.1.0</jmock-cglib.version>
     <junit.version>3.8.1</junit.version>
@@ -266,7 +266,6 @@
       <org.apache.maven.plugins.maven-surefire-plugin.version>2.1.3</org.apache.maven.plugins.maven-surefire-plugin.version>
     -->
     <torque.version>3.2-rc3</torque.version>
-    <tyrex.version>1.0.1</tyrex.version>
 
     <!-- Project Dependency Version Properties -->
     <aopalliance.version>1.0</aopalliance.version>
@@ -338,6 +337,7 @@
     <asm.version>2.2</asm.version>
     <ccpp.version>1.0</ccpp.version>
     <commonj.version>1.1</commonj.version>
+    <tyrex.version>1.0.1</tyrex.version>
   </properties>
 
   <!-- Dependency Configuration -->
@@ -1164,7 +1164,7 @@
 
       <!-- Ant -->
       <dependency>
-        <groupId>ant</groupId>
+        <groupId>org.apache.ant</groupId>
         <artifactId>ant</artifactId>
         <version>${ant.version}</version>
       </dependency>
@@ -1361,6 +1361,7 @@
           <groupId>org.apache.portals.jetspeed-2</groupId>
           <artifactId>jetspeed-mvn-maven-plugin</artifactId>
           <version>${pom.version}</version>
+          <inherited>false</inherited>
           <configuration>
             <targets combine.children="append">
               <target>
@@ -1527,6 +1528,7 @@
         <module>jetspeed-portal-resources</module>
         <module>jetspeed-commons</module>
         <module>components</module>
+        <module>jetspeed-ant-tasks</module>
         <module>applications</module>
       </modules>
     </profile>
@@ -1555,6 +1557,7 @@
         <module>jetspeed-portal-resources</module>
         <module>jetspeed-commons</module>
         <module>components</module>
+        <module>jetspeed-ant-tasks</module>
         <module>applications</module>
       </modules>
     </profile>



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