Diff
Modified: java/nanocontainer-nanowar/trunk/examples/nanowar-nanoweb-webapp/pom.xml (3125 => 3126)
--- java/nanocontainer-nanowar/trunk/examples/nanowar-nanoweb-webapp/pom.xml 2006-12-19 14:47:41 UTC (rev 3125)
+++ java/nanocontainer-nanowar/trunk/examples/nanowar-nanoweb-webapp/pom.xml 2006-12-19 14:49:29 UTC (rev 3126)
@@ -3,11 +3,12 @@
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.nanocontainer</groupId>
- <artifactId>nanocontainer-nanowar-example</artifactId>
- <version>1.1-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.nanocontainer</groupId>
+ <artifactId>nanocontainer-nanowar-parent</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </parent>
+ <packaging>war</packaging>
<artifactId>nanowar-nanoweb-webapp</artifactId>
<name>Nanowar NanoWeb Webapp</name>
<dependencies>
Copied: java/nanocontainer-nanowar/trunk/examples/nanowar-nanoweb-webapp/src/java/org/nanocontainer/nanowar/sample/nanoweb (from rev 3123, java/nanocontainer-nanowar/trunk/examples/nanowar-sample/src/java/org/nanocontainer/nanowar/sample/nanoweb) ( => )
Copied: java/nanocontainer-nanowar/trunk/examples/nanowar-nanoweb-webapp/src/main/webapp (from rev 3123, java/nanocontainer-nanowar/trunk/examples/nanowar-sample/webapps/nanoweb/webapp)
Deleted: java/nanocontainer-nanowar/trunk/examples/nanowar-sample/maven.xml (3125 => 3126)
--- java/nanocontainer-nanowar/trunk/examples/nanowar-sample/maven.xml 2006-12-19 14:47:41 UTC (rev 3125)
+++ java/nanocontainer-nanowar/trunk/examples/nanowar-sample/maven.xml 2006-12-19 14:49:29 UTC (rev 3126)
@@ -1,100 +0,0 @@
-<project
- xmlns:j="jelly:core"
- xmlns:ant="jelly:ant"
- xmlns:artifact="artifact"
- xmlns:define="jelly:define"
- xmlns:sample="sample">
-
-<!--
- <j:set var="webapp" value="${maven.build.dir}/${pom.artifactId}"/>
- <j:set var="maven.war.src" value="${webapp}"/>
- <define:taglib uri="sample">
- <define:tag name="installWar">
- <j:set var="framework" value="${framework}"/>
- <delete dir="${webapp}"/>
- <copy todir="${webapp}">
- <fileset dir="${basedir}/src/webapps/${framework}"/>
- </copy>
- <attainGoal name="war:webapp"/>
- <jar jarfile="${maven.build.dir}/${pom.artifactId}-${framework}.war">
- <fileset dir="${pom.getPluginContext('maven-war-plugin').getVariable('maven.war.webapp.dir')}"/>
- </jar>
- </define:tag>
- </define:taglib>
-
- <postGoal name="war:install">
- <sample:installWar framework="nanoweb"/>
- <sample:installWar framework="struts"/>
- <sample:installWar framework="webwork1"/>
- <sample:installWar framework="webwork2"/>
- </postGoal>
-
- <postGoal name="war:deploy">
- <sample:deployWar framework="nanoweb"/>
- <sample:deployWar framework="struts"/>
- <sample:deployWar framework="webwork1"/>
- <sample:deployWar framework="webwork2"/>
- </postGoal>
-
- <goal name="deploy:tomcat" prereqs="war:install">
- <ant:property environment="env"/>
- <ant:echo message="Tomcat Home is '${env.TOMCAT_HOME}'"/>
- <ant:copy todir="${env.TOMCAT_HOME}/webapps">
- <ant:fileset dir="${maven.build.dir}">
- <ant:include name="${pom.artifactId}-*.war"/>
- </ant:fileset>
- </ant:copy>
- <ant:delete dir="${env.TOMCAT_HOME}/webapps/${pom.artifactId}-nanoweb" failonerror="false"/>
- <ant:delete dir="${env.TOMCAT_HOME}/webapps/${pom.artifactId}-struts" failonerror="false"/>
- <ant:delete dir="${env.TOMCAT_HOME}/webapps/${pom.artifactId}-webwork1" failonerror="false"/>
- <ant:delete dir="${env.TOMCAT_HOME}/webapps/${pom.artifactId}-webwork2" failonerror="false"/>
- </goal>
-
- <preGoal name="test:test">
- <mkdir dir="${webapp}/WEB-INF/classes"/>
- <copy todir="${webapp}/WEB-INF/classes">
- <fileset dir="${basedir}/target/classes"/>
- </copy>
-
- <mkdir dir="${webapp}/WEB-INF/lib"/>
-
- <j:forEach var="lib" items="${pom.artifacts}">
- <j:set var="dep" value="${lib.dependency}"/>
- <j:if test="${dep.getProperty('war.bundle')=='true'}">
- <j:if test="${dep.type =='jar'}">
- <copy todir="${webapp}/WEB-INF/lib" file="${lib.path}"/>
- </j:if>
- </j:if>
- </j:forEach>
- </preGoal>
--->
-
- <postGoal name="war:webapp">
- <ant:copy todir="${maven.war.webapp.dir}" overwrite="true">
- <ant:fileset dir="webapp" />
- </ant:copy>
- </postGoal>
-
- <goal name="deploy:tomcat" prereqs="war:install">
- <ant:property environment="env"/>
- <ant:echo message="Tomcat Home is '${env.TOMCAT_HOME}'"/>
- <ant:copy todir="${env.TOMCAT_HOME}/webapps">
- <ant:fileset dir="${maven.build.dir}">
- <ant:include name="${pom.artifactId}.war"/>
- </ant:fileset>
- </ant:copy>
- <ant:delete dir="${env.TOMCAT_HOME}/webapps/${pom.artifactId}" failonerror="false"/>
- </goal>
-
- <goal name="deploy:jetty" prereqs="war:install">
- <ant:property environment="env"/>
- <ant:echo message="Jetty Home is '${env.JETTY_HOME}'"/>
- <ant:copy todir="${env.JETTY_HOME}/webapps">
- <ant:fileset dir="${maven.build.dir}">
- <ant:include name="${pom.artifactId}.war"/>
- </ant:fileset>
- </ant:copy>
- </goal>
-
-
-</project>
Modified: java/nanocontainer-nanowar/trunk/examples/nanowar-sample/pom.xml (3125 => 3126)
--- java/nanocontainer-nanowar/trunk/examples/nanowar-sample/pom.xml 2006-12-19 14:47:41 UTC (rev 3125)
+++ java/nanocontainer-nanowar/trunk/examples/nanowar-sample/pom.xml 2006-12-19 14:49:29 UTC (rev 3126)
@@ -16,5 +16,42 @@
<artifactId>nanocontainer-nanowar</artifactId>
<version>1.1-SNAPSHOT</version>
</dependency>
- </dependencies>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <inherited>false</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <links>
+ <link>
+ http://java.sun.com/j2se/1.4.2/docs/api/
+ </link>
+ <link>
+ http://proxytoys.codehaus.org/apidocs/
+ </link>
+ <link>
+ http://jakarta.apache.org/commons/logging/commons-logging-1.0.4/docs/apidocs/
+ </link>
+ </links>
+ <stylesheet>maven</stylesheet>
+ <header>
+ <