Menu
▾
▴
[Vlab-commit] SF.net SVN: vlab:[1198] trunk/vlab/portal
|
From: <das...@us...> - 2008-10-31 19:39:13
|
Revision: 1198
http://vlab.svn.sourceforge.net/vlab/?rev=1198&view=rev
Author: dasil014
Date: 2008-10-31 19:39:03 +0000 (Fri, 31 Oct 2008)
Log Message:
-----------
Backup
Modified Paths:
--------------
trunk/vlab/portal/deploy-all-webapps/pom.xml
trunk/vlab/portal/functional-tests/pom.xml
trunk/vlab/portal/portal-dependent-project/pom.xml
trunk/vlab/portal/pseudo-webapp/pom.xml
trunk/vlab/portal/pseudo-webapp/src/main/webapp/WEB-INF/web.xml
Modified: trunk/vlab/portal/deploy-all-webapps/pom.xml
===================================================================
--- trunk/vlab/portal/deploy-all-webapps/pom.xml 2008-10-31 18:43:30 UTC (rev 1197)
+++ trunk/vlab/portal/deploy-all-webapps/pom.xml 2008-10-31 19:39:03 UTC (rev 1198)
@@ -1,85 +1,88 @@
-<?xml version="1.0"?><project>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>portal-parent</artifactId>
- <groupId>edu.umn.msi.vlab</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
+<?xml version="1.0"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>deploy-all-webapps</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <name>Deploy all web applications</name>
- <description>A pom that deploys all web applications (using the cargo plugin)</description>
+ <parent>
+ <artifactId>portal-parent</artifactId>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <configuration>
- <deployer>
- <type>remote</type>
- <deployables>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>deploy-all-webapps</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
- <deployable>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>pseudo-webapp</artifactId>
- <type>war</type>
- <properties>
- <context>pseudo-repository</context>
- </properties>
- </deployable>
+ <name>Deploy all web applications</name>
+ <description>
+ A pom that deploys all web applications (using the cargo plugin)
+ </description>
- <deployable>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>input-portlet</artifactId>
- <type>war</type>
- <properties>
- <context>input-portlet</context>
- </properties>
- </deployable>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <configuration>
+ <deployer>
+ <type>remote</type>
+ <deployables>
- <deployable>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>vlab-portlets</artifactId>
- <type>war</type>
- <properties>
- <context>vlabportlets</context>
- </properties>
- </deployable>
+ <deployable>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>pseudo-webapp</artifactId>
+ <type>war</type>
+ <properties>
+ <context>pseudo-repository</context>
+ </properties>
+ </deployable>
- </deployables>
- </deployer>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <deployable>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>input-portlet</artifactId>
+ <type>war</type>
+ <properties>
+ <context>input-portlet</context>
+ </properties>
+ </deployable>
- <dependencies>
- <dependency>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>pseudo-webapp</artifactId>
- <version>1.0-SNAPSHOT</version>
- <type>war</type>
- </dependency>
+ <deployable>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>vlab-portlets</artifactId>
+ <type>war</type>
+ <properties>
+ <context>vlabportlets</context>
+ </properties>
+ </deployable>
- <dependency>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>input-portlet</artifactId>
- <version>1.0-SNAPSHOT</version>
- <type>war</type>
- </dependency>
+ </deployables>
+ </deployer>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- <dependency>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>vlab-portlets</artifactId>
- <version>1.0-SNAPSHOT</version>
- <type>war</type>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>pseudo-webapp</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>input-portlet</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>war</type>
+ </dependency>
+
+ <dependency>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>vlab-portlets</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>war</type>
+ </dependency>
+ </dependencies>
+
</project>
Modified: trunk/vlab/portal/functional-tests/pom.xml
===================================================================
--- trunk/vlab/portal/functional-tests/pom.xml 2008-10-31 18:43:30 UTC (rev 1197)
+++ trunk/vlab/portal/functional-tests/pom.xml 2008-10-31 19:39:03 UTC (rev 1198)
@@ -1,191 +1,201 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
- <parent>
- <artifactId>portal-parent</artifactId>
- <groupId>edu.umn.msi.vlab</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>functional-tests</artifactId>
- <name>functional-tests</name>
- <version>1.0-SNAPSHOT</version>
- <url>http://maven.apache.org</url>
- <build>
- <testSourceDirectory>src/it/java</testSourceDirectory>
- <testResources>
- <testResource>
- <filtering>true</filtering>
- <directory>src/it/resources</directory>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludes>
- <exclude>**/BaseGridsphereTestCase.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- <configuration>
- <wait>false</wait>
- <container>
- <containerId>tomcat5x</containerId>
- <home>${tomcat.path}</home>
- <type>installed</type>
- </container>
- <configuration>
- <type>existing</type>
- <home>${tomcat.path}</home>
- <properties>
- <cargo.servlet.port>8280</cargo.servlet.port>
- </properties>
- <deployables>
- <deployable>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>pseudo-webapp</artifactId>
- <type>war</type>
- <properties>
- <context>pseudo-repository</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>input-portlet</artifactId>
- <type>war</type>
- <properties>
- <context>input-portlet</context>
- </properties>
- </deployable>
- <deployable>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>vlab-portlets</artifactId>
- <type>war</type>
- <properties>
- <context>vlabportlets</context>
- </properties>
- </deployable>
- </deployables>
- </configuration>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>1.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>vlab-common</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>vlab-db</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>test-utils</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>pseudo-potential-repository</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>pwscf-input-beans</artifactId>
- <version>1.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>pseudo-webapp</artifactId>
- <version>1.0-SNAPSHOT</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>input-portlet</artifactId>
- <version>1.0-SNAPSHOT</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>vlab-portlets</artifactId>
- <version>1.0-SNAPSHOT</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.jwebunit</groupId>
- <artifactId>jwebunit-core</artifactId>
- <version>1.4.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.jwebunit</groupId>
- <artifactId>jwebunit-htmlunit-plugin</artifactId>
- <version>1.4.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <show>private</show>
- <sourcepath>${basedir}/src/it/java</sourcepath>
- <doclet>gr.spinellis.umlgraph.doclet.UmlGraphDoc</doclet>
- <docletArtifact>
- <groupId>gr.spinellis</groupId>
- <artifactId>UmlGraph</artifactId>
- <version>4.8</version>
- </docletArtifact>
- <additionalparam>-inferrel -inferdep -quiet -hide java.* -collpackages java.util.* -qualify
- -postfixpackage -nodefontsize 9
- -nodefontpackagesize 7
- -operations</additionalparam>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-</project>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+ <parent>
+ <artifactId>portal-parent</artifactId>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>functional-tests</artifactId>
+ <name>functional-tests</name>
+ <version>1.0-SNAPSHOT</version>
+ <url>http://maven.apache.org</url>
+ <build>
+ <testSourceDirectory>src/it/java</testSourceDirectory>
+ <testResources>
+ <testResource>
+ <filtering>true</filtering>
+ <directory>src/it/resources</directory>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <excludes>
+ <exclude>
+ **/BaseGridsphereTestCase.java
+ </exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <configuration>
+ <wait>false</wait>
+ <container>
+ <containerId>tomcat5x</containerId>
+ <home>${tomcat.path}</home>
+ <type>installed</type>
+ </container>
+ <configuration>
+ <type>existing</type>
+ <home>${tomcat.path}</home>
+ <properties>
+ <cargo.servlet.port>
+ 8280
+ </cargo.servlet.port>
+ </properties>
+ <deployables>
+ <deployable>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>pseudo-webapp</artifactId>
+ <type>war</type>
+ <properties>
+ <context>pseudo-repository</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>input-portlet</artifactId>
+ <type>war</type>
+ <properties>
+ <context>input-portlet</context>
+ </properties>
+ </deployable>
+ <deployable>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>vlab-portlets</artifactId>
+ <type>war</type>
+ <properties>
+ <context>vlabportlets</context>
+ </properties>
+ </deployable>
+ </deployables>
+ </configuration>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>1.11</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>vlab-common</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>vlab-db</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>test-utils</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>pseudo-potential-repository</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>pwscf-input-beans</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>pseudo-webapp</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>input-portlet</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>vlab-portlets</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.jwebunit</groupId>
+ <artifactId>jwebunit-core</artifactId>
+ <version>1.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.jwebunit</groupId>
+ <artifactId>jwebunit-htmlunit-plugin</artifactId>
+ <version>1.4.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <show>private</show>
+ <sourcepath>${basedir}/src/it/java</sourcepath>
+ <doclet>
+ gr.spinellis.umlgraph.doclet.UmlGraphDoc
+ </doclet>
+ <docletArtifact>
+ <groupId>gr.spinellis</groupId>
+ <artifactId>UmlGraph</artifactId>
+ <version>4.8</version>
+ </docletArtifact>
+ <additionalparam>
+ -inferrel -inferdep -quiet -hide java.*
+ -collpackages java.util.* -qualify
+ -postfixpackage -nodefontsize 9
+ -nodefontpackagesize 7 -operations
+ </additionalparam>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
+
Modified: trunk/vlab/portal/portal-dependent-project/pom.xml
===================================================================
--- trunk/vlab/portal/portal-dependent-project/pom.xml 2008-10-31 18:43:30 UTC (rev 1197)
+++ trunk/vlab/portal/portal-dependent-project/pom.xml 2008-10-31 19:39:03 UTC (rev 1198)
@@ -1,155 +1,184 @@
-<?xml version="1.0"?><project>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>portal-parent</artifactId>
- <groupId>edu.umn.msi.vlab</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
+<?xml version="1.0"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>portal-dependent-project</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
-
- <name>Portal shared/lib dependencies</name>
- <description>This pom should be extended by any portlet project that requires any of this pom's dependencies</description>
+ <parent>
+ <artifactId>portal-parent</artifactId>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
- <build>
- <plugins>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>portal-dependent-project</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-property</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <phase>validate</phase>
- <inherited>false</inherited>
- <configuration>
- <rules>
- <requireProperty>
- <property>portal.tomcat.path</property>
- <message>Dependencies shared by multiple portlets need to be copied to your /apache-tomcat-path/shared/lib.
+ <name>Portal shared/lib dependencies</name>
+ <description>
+ This pom should be extended by any portlet project that requires
+ any of this pom's dependencies
+ </description>
- Please define portal.tomcat.path either in the pom.xml or (VERY) preferrably in settings.xml
-
- If you
- do not have a settings.xml, see the vlab/README_ON_PROFILES for a quick start.
+ <build>
+ <plugins>
- already have a settings.xml, add the following property to an active profile:
- <portal.tomcat.path>/enter-your-tomcat-path-here/</portal.tomcat.path>
-
- </message>
- </requireProperty>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-property</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <phase>validate</phase>
+ <inherited>false</inherited>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>
+ portal.tomcat.path
+ </property>
+ <message>
+ Dependencies shared by multiple
+ portlets need to be copied to
+ your
+ /apache-tomcat-path/shared/lib.
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>check-tomcat-path</id>
- <phase>validate</phase>
- <configuration>
- <tasks>
- <available property="tomcat-found" file="${portal.tomcat.path}" type="dir"/>
- <fail message="portal.tomcat.path, '${portal.tomcat.path}', does not point to an existing directory. Please fix this where you define portal.tomcat.path (pom.xml, profiles.xml, or hopefully, ~/.m2/settings.xml)">
- <condition>
- <isfalse value="${tomcat-found}" />
- </condition>
- </fail>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ Please define portal.tomcat.path
+ either in the pom.xml or (VERY)
+ preferrably in settings.xml
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copyToSharedLib</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>vlab-common</artifactId>
- <version>1.0-SNAPSHOT</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>cgl</groupId>
- <artifactId>crossHash</artifactId>
- <version>0.1</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.1-404.jdbc3</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.8</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- <version>1.2.1</version>
- <type>jar</type>
- </artifactItem>
- <artifactItem>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>1.2</version>
- <type>jar</type>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${portal.tomcat.path}/shared/lib</outputDirectory>
- <overWriteIfNewer>true</overWriteIfNewer>
- <overWriteSnapshots>true</overWriteSnapshots>
- </configuration>
- </execution>
- <execution>
- <id>copyToCommonLib</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.1-404.jdbc3</version>
- <type>jar</type>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${portal.tomcat.path}/common/lib</outputDirectory>
- <overWriteIfNewer>true</overWriteIfNewer>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ If you do not have a
+ settings.xml, see the
+ vlab/README_ON_PROFILES for a
+ quick start.
+ already have a settings.xml, add
+ the following property to an
+ active profile:
+ <portal.tomcat.path>/enter-your-tomcat-path-here/</portal.tomcat.path>
+
+ </message>
+ </requireProperty>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>check-tomcat-path</id>
+ <phase>validate</phase>
+ <configuration>
+ <tasks>
+ <available property="tomcat-found"
+ file="${portal.tomcat.path}" type="dir" />
+ <fail
+ message="portal.tomcat.path, '${portal.tomcat.path}', does not point to an existing directory. Please fix this where you define portal.tomcat.path (pom.xml, profiles.xml, or hopefully, ~/.m2/settings.xml)">
+ <condition>
+ <isfalse
+ value="${tomcat-found}" />
+ </condition>
+ </fail>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copyToSharedLib</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>vlab-common</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>cgl</groupId>
+ <artifactId>crossHash</artifactId>
+ <version>0.1</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.1-404.jdbc3</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>
+ commons-dbcp
+ </artifactId>
+ <version>1.2.1</version>
+ <type>jar</type>
+ </artifactItem>
+ <artifactItem>
+ <groupId>commons-pool</groupId>
+ <artifactId>
+ commons-pool
+ </artifactId>
+ <version>1.2</version>
+ <type>jar</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>
+ ${portal.tomcat.path}/shared/lib
+ </outputDirectory>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ <overWriteSnapshots>
+ true
+ </overWriteSnapshots>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copyToCommonLib</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>8.1-404.jdbc3</version>
+ <type>jar</type>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>
+ ${portal.tomcat.path}/common/lib
+ </outputDirectory>
+ <overWriteIfNewer>true</overWriteIfNewer>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: trunk/vlab/portal/pseudo-webapp/pom.xml
===================================================================
--- trunk/vlab/portal/pseudo-webapp/pom.xml 2008-10-31 18:43:30 UTC (rev 1197)
+++ trunk/vlab/portal/pseudo-webapp/pom.xml 2008-10-31 19:39:03 UTC (rev 1198)
@@ -1,106 +1,117 @@
-<?xml version="1.0" encoding="UTF-8"?><project>
- <parent>
- <artifactId>portal-parent</artifactId>
- <groupId>edu.umn.msi.vlab</groupId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>pseudo-webapp</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>war</packaging>
-
- <name>pseudopotential web application</name>
- <description>Web application for browsing/searching pseudo-potentials</description>
- <url>http://vlab.msi.umn.edu</url>
-
- <build>
- <finalName>pseudo-repository</finalName>
- <plugins>
- <plugin>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>netbeans-freeform-maven-plugin</artifactId>
- <configuration>
- <additionalFolders>src/main/webapp</additionalFolders>
- <additionalGoals>source:war</additionalGoals>
- <additionalGoals>clean install</additionalGoals>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <repositories>
- <repository>
- <id>bollig-repo</id>
- <name>Evan Bollig's Personal Maven2 Repo (bo...@ms...
- for support)</name>
- <url>http://www.scs.fsu.edu/~bollig/maven/repository</url>
- </repository>
- <repository>
- <id>extreme.indiana</id>
- <name>Indiana University Extreme Lab Maven 1 Repository</name>
- <url>http://www.extreme.indiana.edu/dist/java-repository/</url>
- </repository>
- </repositories>
-
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>pseudo-potential-repository</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>vlab-base</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>vlab-db</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>edu.umn.msi.vlab</groupId>
- <artifactId>vlab-common</artifactId>
- <version>1.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>cgl</groupId>
- <artifactId>crossHash</artifactId>
- <version>0.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.11</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.1.1</version>
- </dependency>
- </dependencies>
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <parent>
+ <artifactId>portal-parent</artifactId>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>pseudo-webapp</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+
+ <name>pseudopotential web application</name>
+ <description>
+ Web application for browsing/searching pseudo-potentials
+ </description>
+ <url>http://vlab.msi.umn.edu</url>
+
+ <build>
+ <finalName>pseudo-repository</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>netbeans-freeform-maven-plugin</artifactId>
+ <configuration>
+ <additionalFolders>
+ src/main/webapp
+ </additionalFolders>
+ <additionalGoals>source:war</additionalGoals>
+ <additionalGoals>clean install</additionalGoals>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <repositories>
+ <repository>
+ <id>bollig-repo</id>
+ <name>
+ Evan Bollig's Personal Maven2 Repo (bo...@ms...
+ for support)
+ </name>
+ <url>http://www.scs.fsu.edu/~bollig/maven/repository</url>
+ </repository>
+ <repository>
+ <id>extreme.indiana</id>
+ <name>
+ Indiana University Extreme Lab Maven 1 Repository
+ </name>
+ <url>
+ http://www.extreme.indiana.edu/dist/java-repository/
+ </url>
+ </repository>
+ </repositories>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>pseudo-potential-repository</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>vlab-base</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>vlab-db</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>edu.umn.msi.vlab</groupId>
+ <artifactId>vlab-common</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>cgl</groupId>
+ <artifactId>crossHash</artifactId>
+ <version>0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.11</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ </dependencies>
</project>
Modified: trunk/vlab/portal/pseudo-webapp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/vlab/portal/pseudo-webapp/src/main/webapp/WEB-INF/web.xml 2008-10-31 18:43:30 UTC (rev 1197)
+++ trunk/vlab/portal/pseudo-webapp/src/main/webapp/WEB-INF/web.xml 2008-10-31 19:39:03 UTC (rev 1198)
@@ -13,42 +13,46 @@
<welcome-file>default.jsp</welcome-file>
</welcome-file-list>
- <filter>
- <filter-name>HibernateFilter</filter-name>
- <filter-class>org.vlab.pseudo.web.HibernateSessionRequestFilter</filter-class>
- </filter>
+ <filter>
+ <filter-name>HibernateFilter</filter-name>
+ <filter-class>
+ org.vlab.pseudo.web.HibernateSessionRequestFilter
+ </filter-class>
+ </filter>
- <filter-mapping>
- <filter-name>HibernateFilter</filter-name>
- <!-- consider /*.jsp instead of /*, to avoid starting session for HTML pages. -->
- <url-pattern>/*</url-pattern>
- </filter-mapping>
+ <filter-mapping>
+ <filter-name>HibernateFilter</filter-name>
+ <!-- consider /*.jsp instead of /*, to avoid starting session for HTML pages. -->
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
<servlet>
<servlet-name>PseudoServlet</servlet-name>
<servlet-class>org.vlab.pseudo.web.PseudoServlet</servlet-class>
-
+
<load-on-startup>1</load-on-startup>
-
-
+
+
</servlet>
-
+
<servlet>
<servlet-name>PseudoAdminServlet</servlet-name>
- <servlet-class>org.vlab.pseudo.web.PseudoAdminServlet</servlet-class>
+ <servlet-class>
+ org.vlab.pseudo.web.PseudoAdminServlet
+ </servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
-
+
<servlet-mapping>
<servlet-name>PseudoServlet</servlet-name>
<url-pattern>/pseudoServlet</url-pattern>
</servlet-mapping>
-
+
<servlet-mapping>
<servlet-name>PseudoAdminServlet</servlet-name>
<url-pattern>/adminServlet</url-pattern>
</servlet-mapping>
-
+
<session-config>
<session-timeout>30</session-timeout>
</session-config>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
