You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ca...@apache.org on 2006/09/01 03:32:35 UTC
svn commit: r439129 - in /maven/shared/trunk/maven-user: ./
maven-user-controller/ maven-user-example/ maven-user-example/src/
maven-user-example/src/main/ maven-user-example/src/main/resources/
maven-user-example/src/main/resources/META-INF/ maven-use...
Author: carlos
Date: Thu Aug 31 18:32:34 2006
New Revision: 439129
URL: http://svn.apache.org/viewvc?rev=439129&view=rev
Log:
Added maven-user-example and push up common config
Added:
maven/shared/trunk/maven-user/maven-user-example/
maven/shared/trunk/maven-user/maven-user-example/pom.xml (with props)
maven/shared/trunk/maven-user/maven-user-example/src/
maven/shared/trunk/maven-user/maven-user-example/src/main/
maven/shared/trunk/maven-user/maven-user-example/src/main/resources/
maven/shared/trunk/maven-user/maven-user-example/src/main/resources/META-INF/
maven/shared/trunk/maven-user/maven-user-example/src/main/resources/META-INF/plexus/
maven/shared/trunk/maven-user/maven-user-example/src/main/resources/META-INF/plexus/application.xml (with props)
maven/shared/trunk/maven-user/maven-user-example/src/main/webapp/
maven/shared/trunk/maven-user/maven-user-example/src/main/webapp/WEB-INF/
maven/shared/trunk/maven-user/maven-user-example/src/main/webapp/WEB-INF/web.xml (with props)
Modified:
maven/shared/trunk/maven-user/maven-user-controller/pom.xml
maven/shared/trunk/maven-user/maven-user-webapp/pom.xml
maven/shared/trunk/maven-user/pom.xml
Modified: maven/shared/trunk/maven-user/maven-user-controller/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-controller/pom.xml?rev=439129&r1=439128&r2=439129&view=diff
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-controller/pom.xml (original)
+++ maven/shared/trunk/maven-user/maven-user-controller/pom.xml Thu Aug 31 18:32:34 2006
@@ -35,6 +35,18 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>1.2.7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-mock</artifactId>
+ <version>1.2.7</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<scope>test</scope>
Added: maven/shared/trunk/maven-user/maven-user-example/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-example/pom.xml?rev=439129&view=auto
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-example/pom.xml (added)
+++ maven/shared/trunk/maven-user/maven-user-example/pom.xml Thu Aug 31 18:32:34 2006
@@ -0,0 +1,65 @@
+<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>
+
+ <parent>
+ <groupId>org.apache.maven.shared.user</groupId>
+ <artifactId>maven-user</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>maven-user-example</artifactId>
+ <packaging>war</packaging>
+
+ <name>Maven User Management Example Webapp</name>
+ <description>User Management Example Webapp</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-log4j-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>maven-user-webapp</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>maven-user-controller</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>maven-user-acegi</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jspc-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: maven/shared/trunk/maven-user/maven-user-example/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/shared/trunk/maven-user/maven-user-example/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/shared/trunk/maven-user/maven-user-example/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-example/src/main/resources/META-INF/plexus/application.xml?rev=439129&view=auto
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-example/src/main/resources/META-INF/plexus/application.xml (added)
+++ maven/shared/trunk/maven-user/maven-user-example/src/main/resources/META-INF/plexus/application.xml Thu Aug 31 18:32:34 2006
@@ -0,0 +1,130 @@
+<plexus>
+
+ <components>
+
+ <component>
+ <role>org.codehaus.plexus.jdo.JdoFactory</role>
+ <implementation>org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory</implementation>
+ <configuration>
+
+ <!-- HSQLDB Configuration -->
+ <!--
+ NOTE: NO NOT USE THIS CONFIGURATION FOR A PRODUCTION SYSTEM.
+ HSQLDB keeps all data in memory at all times.
+
+ NOTE: JPOX 1.1.1 won't create the tables on start
+ http://www.jpox.org/servlet/jira/browse/CORE-2946
+ -->
+ <!--
+ <driverName>org.hsqldb.jdbcDriver</driverName>
+ <url>jdbc:hsqldb:mem:test</url>
+ <userName>sa</userName>
+ <password></password>
+ -->
+
+ <!-- Apache Derby Configuration -->
+ <driverName>org.apache.derby.jdbc.EmbeddedDriver</driverName>
+ <url>jdbc:derby:${plexus.home}/database;create=true</url>
+ <userName>sa</userName>
+ <password></password>
+
+ <!-- Postgresql Configuration -->
+ <!--
+ <driverName>org.postgresql.Driver</driverName>
+ <url>jdbc:postgresql://localhost/continuum</url>
+ <userName>username</userName>
+ <password></password>
+ -->
+
+ <!-- JPOX and JDO configuration -->
+ <persistenceManagerFactoryClass>org.jpox.PersistenceManagerFactoryImpl</persistenceManagerFactoryClass>
+ <otherProperties>
+ <property>
+ <name>org.jpox.autoCreateSchema</name>
+ <value>true</value>
+ </property>
+ <property>
+ <name>org.jpox.autoStartMechanism</name>
+ <value>SchemaTable</value>
+ </property>
+ <property>
+ <name>org.jpox.autoStartMechanismMode</name>
+ <value>Ignored</value>
+ </property>
+ <property>
+ <name>org.jpox.validateTables</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>org.jpox.validateConstraints</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>org.jpox.transactionIsolation</name>
+ <value>READ_UNCOMMITTED</value>
+ </property>
+ <property>
+ <name>org.jpox.poid.transactionIsolation</name>
+ <value>READ_UNCOMMITTED</value>
+ </property>
+ </otherProperties>
+ </configuration>
+ </component>
+
+
+ <!--
+ | Logger manager
+ -->
+ <component>
+ <role>org.codehaus.plexus.logging.LoggerManager</role>
+ <implementation>org.codehaus.plexus.logging.log4j.Log4JLoggerManager</implementation>
+ <lifecycle-handler>basic</lifecycle-handler>
+
+ <configuration>
+ <threshold>INFO</threshold>
+ <default-appender>console,rolling</default-appender>
+ <appenders>
+ <appender>
+ <id>console</id>
+ <threshold>INFO</threshold>
+ <type>org.apache.log4j.ConsoleAppender</type>
+ <conversion-pattern>%d [%t] %-5p %-30c{1} - %m%n</conversion-pattern>
+ </appender>
+
+ <appender>
+ <id>rolling</id>
+ <threshold>DEBUG</threshold>
+ <type>org.apache.log4j.RollingFileAppender</type>
+ <conversion-pattern>%-4r [%t] %-5p %c %x - %m%n</conversion-pattern>
+
+ <properties>
+ <property>
+ <name>file</name>
+ <value>${plexus.home}/logs/continuum.log</value>
+ </property>
+ <property>
+ <name>append</name>
+ <value>true</value>
+ </property>
+ <property>
+ <name>maxBackupIndex</name>
+ <value>10</value>
+ </property>
+ <property>
+ <name>maxFileSize</name>
+ <value>10MB</value>
+ </property>
+ </properties>
+ </appender>
+ </appenders>
+ <levels>
+ <level>
+ <hierarchy>JPOX.Cache</hierarchy>
+ <level>WARN</level>
+ </level>
+ </levels>
+ </configuration>
+ </component>
+ </components>
+
+</plexus>
Propchange: maven/shared/trunk/maven-user/maven-user-example/src/main/resources/META-INF/plexus/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/shared/trunk/maven-user/maven-user-example/src/main/resources/META-INF/plexus/application.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/shared/trunk/maven-user/maven-user-example/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-example/src/main/webapp/WEB-INF/web.xml?rev=439129&view=auto
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-example/src/main/webapp/WEB-INF/web.xml (added)
+++ maven/shared/trunk/maven-user/maven-user-example/src/main/webapp/WEB-INF/web.xml Thu Aug 31 18:32:34 2006
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+
+ <display-name>Maven User Management</display-name>
+
+ <context-param>
+ <param-name>extremecomponentsPreferencesLocation</param-name>
+ <param-value>/extremecomponents.properties</param-value>
+ </context-param>
+
+ <context-param>
+ <param-name>extremecomponentsMessagesLocation</param-name>
+ <param-value>localization/MavenUser</param-value>
+ </context-param>
+
+ <filter>
+ <filter-name>webwork-cleanup</filter-name>
+ <filter-class>com.opensymphony.webwork.dispatcher.ActionContextCleanUp</filter-class>
+ </filter>
+
+ <filter>
+ <filter-name>webwork</filter-name>
+ <filter-class>com.opensymphony.webwork.dispatcher.FilterDispatcher</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>webwork-cleanup</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
+ <filter-name>webwork</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <listener>
+ <listener-class>org.codehaus.plexus.xwork.PlexusLifecycleListener</listener-class>
+ </listener>
+
+ <!-- [jspc-maven-plugin:post-compiled-jsps-as-servlets] -->
+
+</web-app>
Propchange: maven/shared/trunk/maven-user/maven-user-example/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/shared/trunk/maven-user/maven-user-example/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/shared/trunk/maven-user/maven-user-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/maven-user-webapp/pom.xml?rev=439129&r1=439128&r2=439129&view=diff
==============================================================================
--- maven/shared/trunk/maven-user/maven-user-webapp/pom.xml (original)
+++ maven/shared/trunk/maven-user/maven-user-webapp/pom.xml Thu Aug 31 18:32:34 2006
@@ -21,14 +21,10 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-log4j-logging</artifactId>
- <version>1.1-alpha-3-SNAPSHOT</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-10-SNAPSHOT</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -65,43 +61,8 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.1.1-20060724.192148-1</version>
- <!-- This configuration is added to cleanup from war:inplace -->
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/src/main/webapp</directory>
- <includes>
- <include>META-INF</include>
- <include>WEB-INF/classes</include>
- <include>WEB-INF/tld</include>
- <include>WEB-INF/lib</include>
- </includes>
- <excludes>
- <excludes>user/*</excludes>
- <excludes>WEB-INF/*.tld</excludes>
- <excludes>WEB-INF/*.xml</excludes>
- </excludes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jspc-maven-plugin</artifactId>
- <configuration>
- <warSourceDirectory>${project.build.directory}/${project.build.finalName}/</warSourceDirectory>
- <injectString><![CDATA[<!-- [jspc-maven-plugin:post-compiled-jsps-as-servlets] -->]]></injectString>
- <!--
- Uncomment outputWebXml if you want the generated web.xml to
- be placed in the working directory that the war:war mojo uses.
- -->
- <!--
- <outputWebXml>${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml</outputWebXml>
- -->
- </configuration>
<executions>
<execution>
<phase>package</phase>
@@ -111,34 +72,7 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <configuration>
- <scanIntervalSeconds>10</scanIntervalSeconds>
- <contextPath>/</contextPath>
- <connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>9090</port>
- <maxIdleTime>60000</maxIdleTime>
- </connector>
- </connectors>
- </configuration>
- </plugin>
</plugins>
</build>
- <pluginRepositories>
- <pluginRepository>
- <!-- Needed for maven-clean-plugin with fileset support -->
- <id>snapshots.apache.org</id>
- <url>http://people.apache.org/maven-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </pluginRepository>
- </pluginRepositories>
</project>
Modified: maven/shared/trunk/maven-user/pom.xml
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-user/pom.xml?rev=439129&r1=439128&r2=439129&view=diff
==============================================================================
--- maven/shared/trunk/maven-user/pom.xml (original)
+++ maven/shared/trunk/maven-user/pom.xml Thu Aug 31 18:32:34 2006
@@ -34,6 +34,7 @@
<module>maven-user-controller</module>
<module>maven-user-webapp</module>
<module>maven-user-acegi</module>
+ <module>maven-user-example</module>
</modules>
<repositories>
@@ -54,6 +55,19 @@
</releases>
</repository>
</repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <!-- Needed for maven-clean-plugin with fileset support -->
+ <id>apache.org</id>
+ <url>http://people.apache.org/maven-snapshot-repository</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
<dependencyManagement>
<dependencies>
@@ -81,13 +95,82 @@
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.8.0.4</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.0-alpha-10-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-log4j-logging</artifactId>
+ <version>1.1-alpha-2</version>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.1.1-20060724.192148-1</version>
+ <!-- This configuration is added to cleanup from war:inplace -->
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}/src/main/webapp</directory>
+ <includes>
+ <include>META-INF</include>
+ <include>WEB-INF/classes</include>
+ <include>WEB-INF/tld</include>
+ <include>WEB-INF/lib</include>
+ </includes>
+ <excludes>
+ <excludes>user/*</excludes>
+ <excludes>WEB-INF/*.tld</excludes>
+ <excludes>WEB-INF/*.xml</excludes>
+ </excludes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
+ <contextPath>/</contextPath>
+ <connectors>
+ <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+ <port>9090</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+ </connectors>
+ </configuration>
+ </plugin>
+ </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jspc-maven-plugin</artifactId>
+ <configuration>
+ <warSourceDirectory>${project.build.directory}/${project.build.finalName}/</warSourceDirectory>
+ <injectString><![CDATA[<!-- [jspc-maven-plugin:post-compiled-jsps-as-servlets] -->]]></injectString>
+ <!--
+ Uncomment outputWebXml if you want the generated web.xml to
+ be placed in the working directory that the war:war mojo uses.
+ -->
+ <!--
+ <outputWebXml>${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml</outputWebXml>
+ -->
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>