Diff
Modified: java/nanocontainer-nanowar/trunk/examples/nanowar-jsf-webapp/pom.xml (3158 => 3159)
--- java/nanocontainer-nanowar/trunk/examples/nanowar-jsf-webapp/pom.xml 2006-12-27 12:57:13 UTC (rev 3158)
+++ java/nanocontainer-nanowar/trunk/examples/nanowar-jsf-webapp/pom.xml 2006-12-27 13:23:22 UTC (rev 3159)
@@ -24,20 +24,18 @@
<version>1.1-SNAPSHOT</version>
</parent>
<artifactId>nanocontainer-jsf-webapp</artifactId>
- <name>NanoContainer Nanowar Example</name>
+ <name>NanoContainer Nanowar JSF webapp</name>
<packaging>war</packaging>
<dependencies>
<dependency>
- <groupId>org.nanocontainer</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>nanocontainer-nanowar</artifactId>
- <version>1.1-SNAPSHOT</version>
- <scope>compile</scope>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.nanocontainer</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>nanocontainer-nanowar-example</artifactId>
- <version>1.1-SNAPSHOT</version>
- <scope>compile</scope>
+ <version>${pom.version}</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
@@ -63,18 +61,6 @@
<version>1.2.13</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>1.0-RC-01</version>
- <exclusions>
- <exclusion>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
- </exclusion>
- </exclusions>
- <scope>runtime</scope>
- </dependency>
</dependencies>
<build>
<plugins>
Modified: java/nanocontainer-nanowar/trunk/examples/nanowar-nanoweb-webapp/pom.xml (3158 => 3159)
--- java/nanocontainer-nanowar/trunk/examples/nanowar-nanoweb-webapp/pom.xml 2006-12-27 12:57:13 UTC (rev 3158)
+++ java/nanocontainer-nanowar/trunk/examples/nanowar-nanoweb-webapp/pom.xml 2006-12-27 13:23:22 UTC (rev 3159)
@@ -13,14 +13,14 @@
<name>Nanowar NanoWeb Webapp</name>
<dependencies>
<dependency>
- <groupId>org.nanocontainer</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>nanocontainer-nanowar-nanoweb</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.nanocontainer</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>nanocontainer-nanowar-example</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
</project>
Modified: java/nanocontainer-nanowar/trunk/examples/nanowar-sample/pom.xml (3158 => 3159)
--- java/nanocontainer-nanowar/trunk/examples/nanowar-sample/pom.xml 2006-12-27 12:57:13 UTC (rev 3158)
+++ java/nanocontainer-nanowar/trunk/examples/nanowar-sample/pom.xml 2006-12-27 13:23:22 UTC (rev 3159)
@@ -12,9 +12,9 @@
<name>NanoContainer Nanowar Example</name>
<dependencies>
<dependency>
- <groupId>org.nanocontainer</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>nanocontainer-nanowar</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
<build>
Modified: java/nanocontainer-nanowar/trunk/examples/nanowar-struts-webapp/pom.xml (3158 => 3159)
--- java/nanocontainer-nanowar/trunk/examples/nanowar-struts-webapp/pom.xml 2006-12-27 12:57:13 UTC (rev 3158)
+++ java/nanocontainer-nanowar/trunk/examples/nanowar-struts-webapp/pom.xml 2006-12-27 13:23:22 UTC (rev 3159)
@@ -13,14 +13,14 @@
<name>Nanowar Struts Webapp</name>
<dependencies>
<dependency>
- <groupId>org.nanocontainer</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>nanocontainer-nanowar-struts</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.nanocontainer</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>nanocontainer-nanowar-example</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
</project>
Modified: java/nanocontainer-nanowar/trunk/examples/nanowar-webwork-webapp/pom.xml (3158 => 3159)
--- java/nanocontainer-nanowar/trunk/examples/nanowar-webwork-webapp/pom.xml 2006-12-27 12:57:13 UTC (rev 3158)
+++ java/nanocontainer-nanowar/trunk/examples/nanowar-webwork-webapp/pom.xml 2006-12-27 13:23:22 UTC (rev 3159)
@@ -13,14 +13,14 @@
<name>Nanowar WebWork Webapp</name>
<dependencies>
<dependency>
- <groupId>org.nanocontainer</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>nanocontainer-nanowar-webwork</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.nanocontainer</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>nanocontainer-nanowar-example</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
</project>
Modified: java/nanocontainer-nanowar/trunk/examples/nanowar-webwork2-webapp/pom.xml (3158 => 3159)
--- java/nanocontainer-nanowar/trunk/examples/nanowar-webwork2-webapp/pom.xml 2006-12-27 12:57:13 UTC (rev 3158)
+++ java/nanocontainer-nanowar/trunk/examples/nanowar-webwork2-webapp/pom.xml 2006-12-27 13:23:22 UTC (rev 3159)
@@ -13,14 +13,14 @@
<name>Nanowar WebWork 2 Webapp</name>
<dependencies>
<dependency>
- <groupId>org.nanocontainer</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>nanocontainer-nanowar-webwork2</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
<dependency>
- <groupId>org.nanocontainer</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>nanocontainer-nanowar-example</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
</project>
Modified: java/nanocontainer-nanowar/trunk/nanowar/pom.xml (3158 => 3159)
--- java/nanocontainer-nanowar/trunk/nanowar/pom.xml 2006-12-27 12:57:13 UTC (rev 3158)
+++ java/nanocontainer-nanowar/trunk/nanowar/pom.xml 2006-12-27 13:23:22 UTC (rev 3159)
@@ -12,12 +12,12 @@
<name>NanoContainer Nanowar Core</name>
<dependencies>
<dependency>
- <groupId>org.nanocontainer</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>nanocontainer</artifactId>
</dependency>
<dependency>
- <groupId>groovy</groupId>
- <artifactId>groovy-all</artifactId>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>nanocontainer-groovy</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: java/nanocontainer-nanowar/trunk/nanowar-axis/pom.xml (3158 => 3159)
--- java/nanocontainer-nanowar/trunk/nanowar-axis/pom.xml 2006-12-27 12:57:13 UTC (rev 3158)
+++ java/nanocontainer-nanowar/trunk/nanowar-axis/pom.xml 2006-12-27 13:23:22 UTC (rev 3159)
@@ -11,11 +11,10 @@
<artifactId>nanocontainer-nanowar-axis</artifactId>
<name>NanoContainer Nanowar Axis</name>
<dependencies>
- <dependency>
- <groupId>org.nanocontainer</groupId>
- <artifactId>nanocontainer-nanowar</artifactId>
- <version>1.1-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>nanocontainer-nanowar</artifactId>
+ </dependency>
<dependency>
<groupId>axis</groupId>
<artifactId>axis</artifactId>
Modified: java/nanocontainer-nanowar/trunk/nanowar-jsf/pom.xml (3158 => 3159)
--- java/nanocontainer-nanowar/trunk/nanowar-jsf/pom.xml 2006-12-27 12:57:13 UTC (rev 3158)
+++ java/nanocontainer-nanowar/trunk/nanowar-jsf/pom.xml 2006-12-27 13:23:22 UTC (rev 3159)
@@ -12,25 +12,20 @@
<name>NanoContainer Nanowar JSF</name>
<description>NanoWAR-JSF integration for JSF API version 1.1</description>
<dependencies>
- <dependency>
- <groupId>org.nanocontainer</groupId>
- <artifactId>nanocontainer-nanowar</artifactId>
- <version>1.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>nanocontainer-nanowar</artifactId>
+ </dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>1.1_02</version>
- <optional>true</optional>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
+ <artifactId>cglib-nodep</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
Modified: java/nanocontainer-nanowar/trunk/nanowar-nanoweb/pom.xml (3158 => 3159)
--- java/nanocontainer-nanowar/trunk/nanowar-nanoweb/pom.xml 2006-12-27 12:57:13 UTC (rev 3158)
+++ java/nanocontainer-nanowar/trunk/nanowar-nanoweb/pom.xml 2006-12-27 13:23:22 UTC (rev 3159)
@@ -11,21 +11,19 @@
<artifactId>nanocontainer-nanowar-nanoweb</artifactId>
<name>NanoContainer Nanowar Nanoweb</name>
<dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>nanocontainer-nanowar</artifactId>
+ </dependency>
<dependency>
<groupId>org.nanocontainer</groupId>
- <artifactId>nanocontainer-nanowar</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <artifactId>nanocontainer-groovy</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <optional>false</optional>
- </dependency>
- <dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
</dependency>
Modified: java/nanocontainer-nanowar/trunk/nanowar-struts/pom.xml (3158 => 3159)
--- java/nanocontainer-nanowar/trunk/nanowar-struts/pom.xml 2006-12-27 12:57:13 UTC (rev 3158)
+++ java/nanocontainer-nanowar/trunk/nanowar-struts/pom.xml 2006-12-27 13:23:22 UTC (rev 3159)
@@ -10,18 +10,18 @@
<name>NanoContainer Nanowar Struts</name>
<dependencies>
<dependency>
- <groupId>org.nanocontainer</groupId>
+ <groupId>${pom.groupId}</groupId>
<artifactId>nanocontainer-nanowar</artifactId>
- <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- </dependency>
- <dependency>
<groupId>struts</groupId>
<artifactId>struts</artifactId>
<version>1.2.7</version>
</dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: java/nanocontainer-nanowar/trunk/nanowar-webwork/pom.xml (3158 => 3159)
--- java/nanocontainer-nanowar/trunk/nanowar-webwork/pom.xml 2006-12-27 12:57:13 UTC (rev 3158)
+++ java/nanocontainer-nanowar/trunk/nanowar-webwork/pom.xml 2006-12-27 13:23:22 UTC (rev 3159)
@@ -9,11 +9,10 @@
<artifactId>nanocontainer-nanowar-webwork</artifactId>
<name>NanoContainer Nanowar WebWork</name>
<dependencies>
- <dependency>
- <groupId>org.nanocontainer</groupId>
- <artifactId>nanocontainer-nanowar</artifactId>
- <version>1.1-SNAPSHOT</version>
- </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>nanocontainer-nanowar</artifactId>
+ </dependency>
<dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
Modified: java/nanocontainer-nanowar/trunk/nanowar-webwork2/pom.xml (3158 => 3159)
--- java/nanocontainer-nanowar/trunk/nanowar-webwork2/pom.xml 2006-12-27 12:57:13 UTC (rev 3158)
+++ java/nanocontainer-nanowar/trunk/nanowar-webwork2/pom.xml 2006-12-27 13:23:22 UTC (rev 3159)
@@ -11,12 +11,11 @@
<artifactId>nanocontainer-nanowar-webwork2</artifactId>
<name>NanoContainer Nanowar WebWork2</name>
<dependencies>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>nanocontainer-nanowar</artifactId>
+ </dependency>
<dependency>
- <groupId>org.nanocontainer</groupId>
- <artifactId>nanocontainer-nanowar</artifactId>
- <version>1.1-SNAPSHOT</version>
- </dependency>
- <dependency>
<groupId>org.picocontainer</groupId>
<artifactId>picocontainer-gems</artifactId>
<optional>false</optional>
Modified: java/nanocontainer-nanowar/trunk/pom.xml (3158 => 3159)
--- java/nanocontainer-nanowar/trunk/pom.xml 2006-12-27 12:57:13 UTC (rev 3158)
+++ java/nanocontainer-nanowar/trunk/pom.xml 2006-12-27 13:23:22 UTC (rev 3159)
@@ -22,6 +22,12 @@
<module>nanowar-struts</module>
<module>nanowar-webwork</module>
<module>nanowar-webwork2</module>
+ <module>examples/nanowar-sample</module>
+ <module>examples/nanowar-jsf-webapp</module>
+ <module>examples/nanowar-nanoweb-webapp</module>
+ <module>examples/nanowar-struts-webapp</module>
+ <module>examples/nanowar-webwork-webapp</module>
+ <module>examples/nanowar-webwork2-webapp</module>
</modules>
<description>
@@ -62,9 +68,19 @@
<dependency>
<groupId>org.nanocontainer</groupId>
<artifactId>nanocontainer</artifactId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.nanocontainer</groupId>
+ <artifactId>nanocontainer-groovy</artifactId>
+ <version>1.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>nanocontainer-nanowar</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.3</version>
@@ -77,22 +93,6 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>1.0-RC-01</version>
- <exclusions>
- <exclusion>
- <groupId>servletapi</groupId>
- <artifactId>servletapi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- </exclusion>
- </exclusions>
- <optional>true</optional>
- </dependency>
- <dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.4</version>
