[picocontainer-scm] [5733] java/2.x/tags: [maven-release-plugin] copy for tag picocontainer-web-2.5.1
paul-yCVjj/[email protected] Sun, 11 Jul 2010 22:06:16 -0500 (CDT)
| Newsgroups | gmane.comp.java.picocontainer.cvs |
|---|---|
| Message-ID | <[email protected]> |
Revision 5733
Author paul
Date 2010-07-11 22:06:15 -0500 (Sun, 11 Jul 2010)
Log Message
[maven-release-plugin] copy for tag picocontainer-web-2.5.1
Added Paths
- java/2.x/tags/picocontainer-web-2.5.1/
- java/2.x/tags/picocontainer-web-2.5.1/pom.xml
- java/2.x/tags/picocontainer-web-2.5.1/web-axis/pom.xml
- java/2.x/tags/picocontainer-web-2.5.1/web-core/pom.xml
- java/2.x/tags/picocontainer-web-2.5.1/web-core/src/java/org/picocontainer/web/PicoServletContainerFilter.java
- java/2.x/tags/picocontainer-web-2.5.1/web-core/src/java/org/picocontainer/web/debug/
- java/2.x/tags/picocontainer-web-2.5.1/web-jsf/pom.xml
- java/2.x/tags/picocontainer-web-2.5.1/web-remoting/pom.xml
- java/2.x/tags/picocontainer-web-2.5.1/web-struts/pom.xml
- java/2.x/tags/picocontainer-web-2.5.1/web-struts2/pom.xml
- java/2.x/tags/picocontainer-web-2.5.1/web-webwork/pom.xml
- java/2.x/tags/picocontainer-web-2.5.1/web-webwork2/pom.xml
Removed Paths
- java/2.x/tags/picocontainer-web-2.5.1/pom.xml
- java/2.x/tags/picocontainer-web-2.5.1/web-axis/pom.xml
- java/2.x/tags/picocontainer-web-2.5.1/web-core/pom.xml
- java/2.x/tags/picocontainer-web-2.5.1/web-core/src/java/org/picocontainer/web/PicoServletContainerFilter.java
- java/2.x/tags/picocontainer-web-2.5.1/web-jsf/pom.xml
- java/2.x/tags/picocontainer-web-2.5.1/web-remoting/pom.xml
- java/2.x/tags/picocontainer-web-2.5.1/web-struts/pom.xml
- java/2.x/tags/picocontainer-web-2.5.1/web-struts2/pom.xml
- java/2.x/tags/picocontainer-web-2.5.1/web-webwork/pom.xml
- java/2.x/tags/picocontainer-web-2.5.1/web-webwork2/pom.xml
Diff
Copied: java/2.x/tags/picocontainer-web-2.5.1 (from rev 5730, java/2.x/trunk/web) ( => )
Property changes on: java/2.x/tags/picocontainer-web-2.5.1
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
bin-groovy
target-eclipse
Name: svn:mergeinfo
+
Deleted: java/2.x/tags/picocontainer-web-2.5.1/pom.xml (5730 => 5733)
--- java/2.x/trunk/web/pom.xml 2010-07-04 23:00:58 UTC (rev 5730)
+++ java/2.x/tags/picocontainer-web-2.5.1/pom.xml 2010-07-12 03:06:15 UTC (rev 5733)
@@ -1,384 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.picocontainer.web</groupId>
- <artifactId>picocontainer-web</artifactId>
- <name>PicoContainer Web</name>
- <version>2.6-SNAPSHOT</version>
- <packaging>pom</packaging>
- <url>http://www.picocontainer.org/web</url>
- <modules>
- <module>web-core</module>
- <module>web-axis</module>
- <module>web-jsf</module>
- <module>web-struts</module>
- <module>web-struts2</module>
- <module>web-webwork</module>
- <module>web-webwork2</module>
- <module>web-remoting</module>
- </modules>
- <description>
- <![CDATA[Please refer to the <a href="http://www.picocontainer.org/web">main website</a> for documentation.]]>
- </description>
- <issueManagement>
- <system>JIRA</system>
- <url>http://jira.codehaus.org/browse/NANOWAR</url>
- </issueManagement>
- <scm>
- <connection>scm:svn:https://svn.codehaus.org/picocontainer/java/2.x/trunk/web</connection>
- <developerConnection>scm:svn:https://svn.codehaus.org/scm/picocontainer/java/2.x/trunk/web</developerConnection>
- <url>https://svn.codehaus.org/picocontainer/java/2.x/trunk/web</url>
- </scm>
- <distributionManagement>
- <repository>
- <id>codehaus.org</id>
- <name>Codehaus PicoContainer Repository</name>
- <url>dav:https://dav.codehaus.org/repository/picocontainer/</url>
- </repository>
- <snapshotRepository>
- <id>codehaus.org</id>
- <name>Codehaus PicoContainer Snapshots Repository</name>
- <url>dav:https://dav.codehaus.org/snapshots.repository/picocontainer/</url>
- </snapshotRepository>
- </distributionManagement>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.picocontainer</groupId>
- <artifactId>picocontainer</artifactId>
- <version>2.11</version>
- </dependency>
- <dependency>
- <groupId>org.picocontainer</groupId>
- <artifactId>picocontainer-gems</artifactId>
- <version>2.11</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.picocontainer.script</groupId>
- <artifactId>picocontainer-script-core</artifactId>
- <version>2.2</version>
- <exclusions>
- <exclusion>
- <groupId>org.picocontainer</groupId>
- <artifactId>picocontainer</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- </exclusions>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.paranamer</groupId>
- <artifactId>paranamer</artifactId>
- <version>2.2.1</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.3.1</version>
- <optional>false</optional>
- <exclusions>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
- <!-- Test scoped depedencies -->
- <dependency>
- <groupId>org.picocontainer</groupId>
- <artifactId>picocontainer-tck</artifactId>
- <version>2.11</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.picocontainer.script</groupId>
- <artifactId>picocontainer-script-testmodel</artifactId>
- <version>2.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.picocontainer.script</groupId>
- <artifactId>picocontainer-script-groovy</artifactId>
- <version>2.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>6.1.22</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- <version>2.5.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-legacy</artifactId>
- <version>2.5.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <version>2.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>httpunit</groupId>
- <artifactId>httpunit</artifactId>
- <version>1.6.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </dependency>
- <!-- test time only -->
- <dependency>
- <groupId>org.picocontainer</groupId>
- <artifactId>picocontainer-tck</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-junit4</artifactId>
- </dependency>
- <dependency>
- <groupId>httpunit</groupId>
- <artifactId>httpunit</artifactId>
- </dependency>
- </dependencies>
- <build>
- <sourceDirectory>src/java</sourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
- <resources>
- <resource>
- <directory>src/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>src/test</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </testResource>
- </testResources>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- <encoding>UTF-8</encoding>
- <optimize>false</optimize>
- <debug>true</debug>
- <showDeprecation>true</showDeprecation>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <id>attach-javadocs</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <links>
- <link>http://java.sun.com/j2se/1.5.0/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>
- <![CDATA[<img class="logo" src="http://www.picocontainer.org/images/pico-logo.png"></img>]]>
- </header>
- <linksource>true</linksource>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
- <configuration>
- <junitArtifactName>junit:junit-dep</junitArtifactName>
- <forkMode>once</forkMode>
- <workingDirectory>${basedir}</workingDirectory>
- <systemProperties>
- <property>
- <name>java.awt.headless</name>
- <value>true</value>
- </property>
- </systemProperties>
- <includes>
- <include>**/*Test.java</include>
- <include>**/*TestCase.java</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.2</version>
- <executions>
- <execution>
- <goals>
- <goal>clean</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-8</version>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- <preparationGoals>clean install</preparationGoals>
- <goals>deploy</goals>
- <tagBase>https://svn.codehaus.org/picocontainer/java/2.x/tags/</tagBase>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-7</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.xsite</groupId>
- <artifactId>xsite-maven-plugin</artifactId>
- <version>1.0</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- </plugins>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-webdav</artifactId>
- <version>1.0-beta-2</version>
- </extension>
- </extensions>
- </build>
- <profiles>
- <profile>
- <id>reporting</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <includeProjectDocumentation>false</includeProjectDocumentation>
- </configuration>
- <executions>
- <execution>
- <phase>install</phase>
- <goals>
- <goal>site</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
- </profile>
- <profile>
- <id>distribution</id>
- <modules>
- <module>distribution</module>
- </modules>
- </profile>
- <profile>
- <id>examples</id>
- <modules>
- <module>examples</module>
- </modules>
- </profile>
- </profiles>
-</project>
Copied: java/2.x/tags/picocontainer-web-2.5.1/pom.xml (from rev 5732, java/2.x/trunk/web/pom.xml) (0 => 5733)
--- java/2.x/tags/picocontainer-web-2.5.1/pom.xml (rev 0)
+++ java/2.x/tags/picocontainer-web-2.5.1/pom.xml 2010-07-12 03:06:15 UTC (rev 5733)
@@ -0,0 +1,384 @@
+<?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">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.picocontainer.web</groupId>
+ <artifactId>picocontainer-web</artifactId>
+ <name>PicoContainer Web</name>
+ <version>2.5.1</version>
+ <packaging>pom</packaging>
+ <url>http://www.picocontainer.org/web</url>
+ <modules>
+ <module>web-core</module>
+ <module>web-axis</module>
+ <module>web-jsf</module>
+ <module>web-struts</module>
+ <module>web-struts2</module>
+ <module>web-webwork</module>
+ <module>web-webwork2</module>
+ <module>web-remoting</module>
+ </modules>
+ <description>
+ <![CDATA[Please refer to the <a href="http://www.picocontainer.org/web">main website</a> for documentation.]]>
+ </description>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://jira.codehaus.org/browse/NANOWAR</url>
+ </issueManagement>
+ <scm>
+ <connection>scm:svn:https://svn.codehaus.org/picocontainer/java/2.x/tags/picocontainer-web-2.5.1</connection>
+ <developerConnection>scm:svn:https://svn.codehaus.org/picocontainer/java/2.x/tags/picocontainer-web-2.5.1</developerConnection>
+ <url>scm:svn:https://svn.codehaus.org/picocontainer/java/2.x/tags/picocontainer-web-2.5.1</url>
+ </scm>
+ <distributionManagement>
+ <repository>
+ <id>codehaus.org</id>
+ <name>Codehaus PicoContainer Repository</name>
+ <url>dav:https://dav.codehaus.org/repository/picocontainer/</url>
+ </repository>
+ <snapshotRepository>
+ <id>codehaus.org</id>
+ <name>Codehaus PicoContainer Snapshots Repository</name>
+ <url>dav:https://dav.codehaus.org/snapshots.repository/picocontainer/</url>
+ </snapshotRepository>
+ </distributionManagement>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ <version>2.11</version>
+ </dependency>
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer-gems</artifactId>
+ <version>2.11</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.picocontainer.script</groupId>
+ <artifactId>picocontainer-script-core</artifactId>
+ <version>2.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </exclusion>
+ </exclusions>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.paranamer</groupId>
+ <artifactId>paranamer</artifactId>
+ <version>2.2.1</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.3.1</version>
+ <optional>false</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_min</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <!-- Test scoped depedencies -->
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer-tck</artifactId>
+ <version>2.11</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.picocontainer.script</groupId>
+ <artifactId>picocontainer-script-testmodel</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.picocontainer.script</groupId>
+ <artifactId>picocontainer-script-groovy</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.22</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <version>2.5.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-legacy</artifactId>
+ <version>2.5.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.6.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <!-- test time only -->
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer-tck</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>src/test</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </testResource>
+ </testResources>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <encoding>UTF-8</encoding>
+ <optimize>false</optimize>
+ <debug>true</debug>
+ <showDeprecation>true</showDeprecation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.0.4</version>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <id>attach-javadocs</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <links>
+ <link>http://java.sun.com/j2se/1.5.0/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>
+ <![CDATA[<img class="logo" src="http://www.picocontainer.org/images/pico-logo.png"></img>]]>
+ </header>
+ <linksource>true</linksource>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <configuration>
+ <junitArtifactName>junit:junit-dep</junitArtifactName>
+ <forkMode>once</forkMode>
+ <workingDirectory>${basedir}</workingDirectory>
+ <systemProperties>
+ <property>
+ <name>java.awt.headless</name>
+ <value>true</value>
+ </property>
+ </systemProperties>
+ <includes>
+ <include>**/*Test.java</include>
+ <include>**/*TestCase.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.0-beta-8</version>
+ <configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ <preparationGoals>clean install</preparationGoals>
+ <goals>deploy</goals>
+ <tagBase>https://svn.codehaus.org/picocontainer/java/2.x/tags/</tagBase>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.xsite</groupId>
+ <artifactId>xsite-maven-plugin</artifactId>
+ <version>1.0</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ </plugins>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav</artifactId>
+ <version>1.0-beta-2</version>
+ </extension>
+ </extensions>
+ </build>
+ <profiles>
+ <profile>
+ <id>reporting</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <includeProjectDocumentation>false</includeProjectDocumentation>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>install</phase>
+ <goals>
+ <goal>site</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+ </profile>
+ <profile>
+ <id>distribution</id>
+ <modules>
+ <module>distribution</module>
+ </modules>
+ </profile>
+ <profile>
+ <id>examples</id>
+ <modules>
+ <module>examples</module>
+ </modules>
+ </profile>
+ </profiles>
+</project>
Deleted: java/2.x/tags/picocontainer-web-2.5.1/web-axis/pom.xml (5730 => 5733)
--- java/2.x/trunk/web/web-axis/pom.xml 2010-07-04 23:00:58 UTC (rev 5730)
+++ java/2.x/tags/picocontainer-web-2.5.1/web-axis/pom.xml 2010-07-12 03:06:15 UTC (rev 5733)
@@ -1,37 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.picocontainer.web</groupId>
- <artifactId>picocontainer-web</artifactId>
- <version>2.6-SNAPSHOT</version>
- </parent>
- <artifactId>picocontainer-web-axis</artifactId>
- <name>PicoContainer Web Axis</name>
- <dependencies>
- <dependency>
- <groupId>org.picocontainer.web</groupId>
- <artifactId>picocontainer-web-core</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis</groupId>
- <artifactId>axis</artifactId>
- <version>1.4</version>
- <exclusions>
- <exclusion>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-</project>
Copied: java/2.x/tags/picocontainer-web-2.5.1/web-axis/pom.xml (from rev 5732, java/2.x/trunk/web/web-axis/pom.xml) (0 => 5733)
--- java/2.x/tags/picocontainer-web-2.5.1/web-axis/pom.xml (rev 0)
+++ java/2.x/tags/picocontainer-web-2.5.1/web-axis/pom.xml 2010-07-12 03:06:15 UTC (rev 5733)
@@ -0,0 +1,37 @@
+<?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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.picocontainer.web</groupId>
+ <artifactId>picocontainer-web</artifactId>
+ <version>2.5.1</version>
+ </parent>
+ <artifactId>picocontainer-web-axis</artifactId>
+ <name>PicoContainer Web Axis</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.picocontainer.web</groupId>
+ <artifactId>picocontainer-web-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis</groupId>
+ <artifactId>axis</artifactId>
+ <version>1.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+</project>
Deleted: java/2.x/tags/picocontainer-web-2.5.1/web-core/pom.xml (5730 => 5733)
--- java/2.x/trunk/web/web-core/pom.xml 2010-07-04 23:00:58 UTC (rev 5730)
+++ java/2.x/tags/picocontainer-web-2.5.1/web-core/pom.xml 2010-07-12 03:06:15 UTC (rev 5733)
@@ -1,41 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.picocontainer.web</groupId>
- <artifactId>picocontainer-web</artifactId>
- <version>2.6-SNAPSHOT</version>
- </parent>
- <artifactId>picocontainer-web-core</artifactId>
- <name>PicoContainer Web Core</name>
- <dependencies>
- <dependency>
- <groupId>org.picocontainer</groupId>
- <artifactId>picocontainer</artifactId>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </dependency>
- <dependency>
- <groupId>org.picocontainer.script</groupId>
- <artifactId>picocontainer-script-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.picocontainer.script</groupId>
- <artifactId>picocontainer-script-testmodel</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.picocontainer.script</groupId>
- <artifactId>picocontainer-script-groovy</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jcache</groupId>
- <artifactId>jcache</artifactId>
- <version>1.0-dev-2</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
-</project>
Copied: java/2.x/tags/picocontainer-web-2.5.1/web-core/pom.xml (from rev 5732, java/2.x/trunk/web/web-core/pom.xml) (0 => 5733)
--- java/2.x/tags/picocontainer-web-2.5.1/web-core/pom.xml (rev 0)
+++ java/2.x/tags/picocontainer-web-2.5.1/web-core/pom.xml 2010-07-12 03:06:15 UTC (rev 5733)
@@ -0,0 +1,42 @@
+<?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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.picocontainer.web</groupId>
+ <artifactId>picocontainer-web</artifactId>
+ <version>2.5.1</version>
+ </parent>
+ <artifactId>picocontainer-web-core</artifactId>
+ <name>PicoContainer Web Core</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.picocontainer.script</groupId>
+ <artifactId>picocontainer-script-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.picocontainer.script</groupId>
+ <artifactId>picocontainer-script-testmodel</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.picocontainer.script</groupId>
+ <artifactId>picocontainer-script-groovy</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jcache</groupId>
+ <artifactId>jcache</artifactId>
+ <version>1.0-dev-2</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+</project>
Deleted: java/2.x/tags/picocontainer-web-2.5.1/web-core/src/java/org/picocontainer/web/PicoServletContainerFilter.java (5730 => 5733)
--- java/2.x/trunk/web/web-core/src/java/org/picocontainer/web/PicoServletContainerFilter.java 2010-07-04 23:00:58 UTC (rev 5730)
+++ java/2.x/tags/picocontainer-web-2.5.1/web-core/src/java/org/picocontainer/web/PicoServletContainerFilter.java 2010-07-12 03:06:15 UTC (rev 5733)
@@ -1,265 +0,0 @@
-/*******************************************************************************
- * Copyright (C) PicoContainer Organization. All rights reserved.
- * --------------------------------------------------------------------------
- * The software in this package is published under the terms of the BSD style
- * license a copy of which has been included with this distribution in the
- * LICENSE.txt file.
- ******************************************************************************/
-package org.picocontainer.web;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectOutputStream;
-import java.lang.reflect.Type;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpServletResponse;
-
-import org.picocontainer.DefaultPicoContainer;
-import org.picocontainer.MutablePicoContainer;
-import org.picocontainer.Characteristics;
-import org.picocontainer.PicoContainer;
-import org.picocontainer.PicoCompositionException;
-import org.picocontainer.lifecycle.DefaultLifecycleState;
-import org.picocontainer.adapters.AbstractAdapter;
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider;
-
-@SuppressWarnings("serial")
-public abstract class PicoServletContainerFilter implements Filter, Serializable {
-
- private boolean exposeServletInfrastructure;
- private boolean isStateless;
- private boolean printSessionSize;
- private boolean debug = false;
-
- public void init(FilterConfig filterConfig) throws ServletException {
- ServletContext context = filterConfig.getServletContext();
- ScopedContainers scopedContainers = getScopedContainers(context);
- setAppContainer(scopedContainers.getApplicationContainer());
-
- isStateless = Boolean.parseBoolean(context.getInitParameter(PicoServletContainerListener.STATELESS_WEBAPP));
- printSessionSize = Boolean.parseBoolean(context.getInitParameter(PicoServletContainerListener.PRINT_SESSION_SIZE));
-
- String exposeServletInfrastructureString = filterConfig.getInitParameter("exposeServletInfrastructure");
- if (exposeServletInfrastructureString == null || Boolean.parseBoolean(exposeServletInfrastructureString)) {
- exposeServletInfrastructure = true;
- }
-
- scopedContainers.getRequestContainer().as(Characteristics.NO_CACHE).addAdapter(new HttpSessionInjector());
- scopedContainers.getRequestContainer().as(Characteristics.NO_CACHE).addAdapter(new HttpServletRequestInjector());
- scopedContainers.getRequestContainer().as(Characteristics.NO_CACHE).addAdapter(new HttpServletResponseInjector());
-
- initAdditionalScopedComponents(scopedContainers.getSessionContainer(), scopedContainers.getRequestContainer());
-
- }
-
- public void destroy() {
- }
-
- private ScopedContainers getScopedContainers(ServletContext context) {
- return (ScopedContainers) context.getAttribute(ScopedContainers.class.getName());
- }
-
- protected void initAdditionalScopedComponents(MutablePicoContainer sessionContainer, MutablePicoContainer reqContainer) {
- }
-
- public static Object getRequestComponentForThread(Class<?> type) {
- MutablePicoContainer requestContainer = ServletFilter.currentRequestContainer.get();
- MutablePicoContainer container = new DefaultPicoContainer(requestContainer);
- container.addComponent(type);
- return container.getComponent(type);
- }
-
- public void doFilter(ServletRequest req, ServletResponse resp, FilterChain filterChain) throws IOException, ServletException {
-
- HttpServletRequest servletRequest = (HttpServletRequest) req;
- HttpSession sess = servletRequest.getSession();
- if (exposeServletInfrastructure) {
- currentSession.set(sess);
- currentRequest.set(req);
- currentResponse.set(resp);
- }
-
- ScopedContainers scopedContainers = getScopedContainers(sess.getServletContext());
-
- SessionStoreHolder ssh = null;
- if (!isStateless) {
-
- ssh = (SessionStoreHolder) sess.getAttribute(SessionStoreHolder.class.getName());
- if (ssh == null) {
- if (scopedContainers.getSessionContainer().getComponentAdapters().size() > 0) {
- throw new PicoContainerWebException("Session not setup correctly. There are components registered " +
- "at the session level, but no working container to host them");
- }
- ssh = new SessionStoreHolder(scopedContainers.getSessionStoring().getCacheForThread(), new DefaultLifecycleState());
- }
-
- scopedContainers.getSessionStoring().putCacheForThread(ssh.getStoreWrapper());
- scopedContainers.getSessionState().putLifecycleStateModelForThread(ssh.getLifecycleState());
-
- }
- scopedContainers.getRequestStoring().resetCacheForThread();
- scopedContainers.getRequestState().resetStateModelForThread();
-
- scopedContainers.getRequestContainer().start();
-
- setAppContainer(scopedContainers.getApplicationContainer());
- if (!isStateless) {
- setSessionContainer(scopedContainers.getSessionContainer());
- }
- setRequestContainer(scopedContainers.getRequestContainer());
-
- containersSetupForRequest(scopedContainers.getApplicationContainer(), scopedContainers.getSessionContainer(), scopedContainers.getRequestContainer(), req, resp);
-
- filterChain.doFilter(req, resp);
-
- setAppContainer(null);
- if (!isStateless) {
- setSessionContainer(null);
- }
- setRequestContainer(null);
-
- scopedContainers.getRequestContainer().stop();
- scopedContainers.getRequestContainer().dispose();
-
- if (!isStateless) {
- if (printSessionSize) {
- printSessionSizeDetailsForDebugging(ssh);
- }
- sess.setAttribute(SessionStoreHolder.class.getName(), ssh);
- }
- scopedContainers.getRequestStoring().invalidateCacheForThread();
- scopedContainers.getRequestState().invalidateStateModelForThread();
-
- if (!isStateless) {
- scopedContainers.getSessionStoring().invalidateCacheForThread();
- scopedContainers.getSessionState().invalidateStateModelForThread();
- }
-
- if (exposeServletInfrastructure) {
- currentSession.set(null);
- currentRequest.set(null);
- currentResponse.set(null);
- }
-
- }
-
- private void printSessionSizeDetailsForDebugging(SessionStoreHolder ssh) throws IOException {
- if ( debug ){
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ObjectOutputStream oos = new ObjectOutputStream(baos);
- oos.writeObject(ssh);
- oos.close();
- baos.close();
- String xml = new XStream(new PureJavaReflectionProvider()).toXML(ssh);
- int bytes = baos.toByteArray().length;
- System.out.println("** Session written (" + bytes + " bytes), xml representation= " + xml);
- }
- }
-
- protected void containersSetupForRequest(MutablePicoContainer appcontainer, MutablePicoContainer sessionContainer,
- MutablePicoContainer requestContainer, ServletRequest req, ServletResponse resp) {
- }
-
- private static ThreadLocal<HttpSession> currentSession = new ThreadLocal<HttpSession>();
- private static ThreadLocal<ServletRequest> currentRequest = new ThreadLocal<ServletRequest>();
- private static ThreadLocal<ServletResponse> currentResponse = new ThreadLocal<ServletResponse>();
-
- protected abstract void setAppContainer(MutablePicoContainer container);
-
- protected abstract void setSessionContainer(MutablePicoContainer container);
-
- protected abstract void setRequestContainer(MutablePicoContainer container);
-
- public static class ServletFilter extends PicoServletContainerFilter {
-
- private static ThreadLocal<MutablePicoContainer> currentAppContainer = new ThreadLocal<MutablePicoContainer>();
- private static ThreadLocal<MutablePicoContainer> currentSessionContainer = new ThreadLocal<MutablePicoContainer>();
- private static ThreadLocal<MutablePicoContainer> currentRequestContainer = new ThreadLocal<MutablePicoContainer>();
-
- protected void setAppContainer(MutablePicoContainer container) {
- if (currentRequestContainer == null) {
- currentRequestContainer = new ThreadLocal<MutablePicoContainer>();
- }
- currentAppContainer.set(container);
- }
-
- protected void setRequestContainer(MutablePicoContainer container) {
- if (currentRequestContainer == null) {
- currentRequestContainer = new ThreadLocal<MutablePicoContainer>();
- }
- currentRequestContainer.set(container);
- }
-
- protected void setSessionContainer(MutablePicoContainer container) {
- if (currentSessionContainer == null) {
- currentSessionContainer = new ThreadLocal<MutablePicoContainer>();
- }
- currentSessionContainer.set(container);
- }
- }
-
- public static class HttpSessionInjector extends AbstractAdapter {
-
- public HttpSessionInjector() {
- super(HttpSession.class, HttpSession.class);
- }
-
- public Object getComponentInstance(PicoContainer picoContainer, Type type) throws PicoCompositionException {
- return currentSession.get();
- }
-
- public void verify(PicoContainer picoContainer) throws PicoCompositionException {
- }
-
- public String getDescriptor() {
- return "HttpSessionInjector";
- }
- }
-
- public static class HttpServletRequestInjector extends AbstractAdapter {
-
- public HttpServletRequestInjector() {
- super(HttpServletRequest.class, HttpServletRequest.class);
- }
-
- public Object getComponentInstance(PicoContainer picoContainer, Type type) throws PicoCompositionException {
- return currentRequest.get();
- }
-
- public void verify(PicoContainer picoContainer) throws PicoCompositionException {
- }
-
- public String getDescriptor() {
- return "HttpServletRequestInjector";
- }
- }
-
- public static class HttpServletResponseInjector extends AbstractAdapter {
-
- public HttpServletResponseInjector() {
- super(HttpServletResponse.class, HttpServletResponse.class);
- }
-
- public Object getComponentInstance(PicoContainer picoContainer, Type type) throws PicoCompositionException {
- return currentResponse.get();
- }
-
- public void verify(PicoContainer picoContainer) throws PicoCompositionException {
- }
-
- public String getDescriptor() {
- return "HttpServletResponseInjector";
- }
- }
-}
Copied: java/2.x/tags/picocontainer-web-2.5.1/web-core/src/java/org/picocontainer/web/PicoServletContainerFilter.java (from rev 5731, java/2.x/trunk/web/web-core/src/java/org/picocontainer/web/PicoServletContainerFilter.java) (0 => 5733)
--- java/2.x/tags/picocontainer-web-2.5.1/web-core/src/java/org/picocontainer/web/PicoServletContainerFilter.java (rev 0)
+++ java/2.x/tags/picocontainer-web-2.5.1/web-core/src/java/org/picocontainer/web/PicoServletContainerFilter.java 2010-07-12 03:06:15 UTC (rev 5733)
@@ -0,0 +1,248 @@
+/*******************************************************************************
+ * Copyright (C) PicoContainer Organization. All rights reserved.
+ * --------------------------------------------------------------------------
+ * The software in this package is published under the terms of the BSD style
+ * license a copy of which has been included with this distribution in the
+ * LICENSE.txt file.
+ ******************************************************************************/
+package org.picocontainer.web;
+
+import org.picocontainer.Characteristics;
+import org.picocontainer.DefaultPicoContainer;
+import org.picocontainer.MutablePicoContainer;
+import org.picocontainer.PicoCompositionException;
+import org.picocontainer.PicoContainer;
+import org.picocontainer.adapters.AbstractAdapter;
+import org.picocontainer.lifecycle.DefaultLifecycleState;
+import org.picocontainer.web.debug.PrintSessionSizeDetailsForDebugging;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.io.Serializable;
+import java.lang.reflect.Type;
+
+@SuppressWarnings("serial")
+public abstract class PicoServletContainerFilter implements Filter, Serializable {
+
+ private boolean exposeServletInfrastructure;
+ private boolean isStateless;
+ private boolean printSessionSize;
+ private boolean debug = false;
+
+ public void init(FilterConfig filterConfig) throws ServletException {
+ ServletContext context = filterConfig.getServletContext();
+ ScopedContainers scopedContainers = getScopedContainers(context);
+ setAppContainer(scopedContainers.getApplicationContainer());
+
+ isStateless = Boolean.parseBoolean(context.getInitParameter(PicoServletContainerListener.STATELESS_WEBAPP));
+ printSessionSize = Boolean.parseBoolean(context.getInitParameter(PicoServletContainerListener.PRINT_SESSION_SIZE));
+
+ String exposeServletInfrastructureString = filterConfig.getInitParameter("exposeServletInfrastructure");
+ if (exposeServletInfrastructureString == null || Boolean.parseBoolean(exposeServletInfrastructureString)) {
+ exposeServletInfrastructure = true;
+ }
+
+ scopedContainers.getRequestContainer().as(Characteristics.NO_CACHE).addAdapter(new HttpSessionInjector());
+ scopedContainers.getRequestContainer().as(Characteristics.NO_CACHE).addAdapter(new HttpServletRequestInjector());
+ scopedContainers.getRequestContainer().as(Characteristics.NO_CACHE).addAdapter(new HttpServletResponseInjector());
+
+ initAdditionalScopedComponents(scopedContainers.getSessionContainer(), scopedContainers.getRequestContainer());
+
+ }
+
+ public void destroy() {
+ }
+
+ private ScopedContainers getScopedContainers(ServletContext context) {
+ return (ScopedContainers) context.getAttribute(ScopedContainers.class.getName());
+ }
+
+ protected void initAdditionalScopedComponents(MutablePicoContainer sessionContainer, MutablePicoContainer reqContainer) {
+ }
+
+ public static Object getRequestComponentForThread(Class<?> type) {
+ MutablePicoContainer requestContainer = ServletFilter.currentRequestContainer.get();
+ MutablePicoContainer container = new DefaultPicoContainer(requestContainer);
+ container.addComponent(type);
+ return container.getComponent(type);
+ }
+
+ public void doFilter(ServletRequest req, ServletResponse resp, FilterChain filterChain) throws IOException, ServletException {
+
+ HttpServletRequest servletRequest = (HttpServletRequest) req;
+ HttpSession sess = servletRequest.getSession();
+ if (exposeServletInfrastructure) {
+ currentSession.set(sess);
+ currentRequest.set(req);
+ currentResponse.set(resp);
+ }
+
+ ScopedContainers scopedContainers = getScopedContainers(sess.getServletContext());
+
+ SessionStoreHolder ssh = null;
+ if (!isStateless) {
+
+ ssh = (SessionStoreHolder) sess.getAttribute(SessionStoreHolder.class.getName());
+ if (ssh == null) {
+ if (scopedContainers.getSessionContainer().getComponentAdapters().size() > 0) {
+ throw new PicoContainerWebException("Session not setup correctly. There are components registered " +
+ "at the session level, but no working container to host them");
+ }
+ ssh = new SessionStoreHolder(scopedContainers.getSessionStoring().getCacheForThread(), new DefaultLifecycleState());
+ }
+
+ scopedContainers.getSessionStoring().putCacheForThread(ssh.getStoreWrapper());
+ scopedContainers.getSessionState().putLifecycleStateModelForThread(ssh.getLifecycleState());
+
+ }
+ scopedContainers.getRequestStoring().resetCacheForThread();
+ scopedContainers.getRequestState().resetStateModelForThread();
+
+ scopedContainers.getRequestContainer().start();
+
+ setAppContainer(scopedContainers.getApplicationContainer());
+ if (!isStateless) {
+ setSessionContainer(scopedContainers.getSessionContainer());
+ }
+ setRequestContainer(scopedContainers.getRequestContainer());
+
+ containersSetupForRequest(scopedContainers.getApplicationContainer(), scopedContainers.getSessionContainer(), scopedContainers.getRequestContainer(), req, resp);
+
+ filterChain.doFilter(req, resp);
+
+ setAppContainer(null);
+ if (!isStateless) {
+ setSessionContainer(null);
+ }
+ setRequestContainer(null);
+
+ scopedContainers.getRequestContainer().stop();
+ scopedContainers.getRequestContainer().dispose();
+
+ if (!isStateless) {
+ if (printSessionSize) {
+ PrintSessionSizeDetailsForDebugging.printItIfDebug(debug, ssh);
+ }
+ sess.setAttribute(SessionStoreHolder.class.getName(), ssh);
+ }
+ scopedContainers.getRequestStoring().invalidateCacheForThread();
+ scopedContainers.getRequestState().invalidateStateModelForThread();
+
+ if (!isStateless) {
+ scopedContainers.getSessionStoring().invalidateCacheForThread();
+ scopedContainers.getSessionState().invalidateStateModelForThread();
+ }
+
+ if (exposeServletInfrastructure) {
+ currentSession.set(null);
+ currentRequest.set(null);
+ currentResponse.set(null);
+ }
+
+ }
+
+ protected void containersSetupForRequest(MutablePicoContainer appcontainer, MutablePicoContainer sessionContainer,
+ MutablePicoContainer requestContainer, ServletRequest req, ServletResponse resp) {
+ }
+
+ private static ThreadLocal<HttpSession> currentSession = new ThreadLocal<HttpSession>();
+ private static ThreadLocal<ServletRequest> currentRequest = new ThreadLocal<ServletRequest>();
+ private static ThreadLocal<ServletResponse> currentResponse = new ThreadLocal<ServletResponse>();
+
+ protected abstract void setAppContainer(MutablePicoContainer container);
+
+ protected abstract void setSessionContainer(MutablePicoContainer container);
+
+ protected abstract void setRequestContainer(MutablePicoContainer container);
+
+ public static class ServletFilter extends PicoServletContainerFilter {
+
+ private static ThreadLocal<MutablePicoContainer> currentAppContainer = new ThreadLocal<MutablePicoContainer>();
+ private static ThreadLocal<MutablePicoContainer> currentSessionContainer = new ThreadLocal<MutablePicoContainer>();
+ private static ThreadLocal<MutablePicoContainer> currentRequestContainer = new ThreadLocal<MutablePicoContainer>();
+
+ protected void setAppContainer(MutablePicoContainer container) {
+ if (currentRequestContainer == null) {
+ currentRequestContainer = new ThreadLocal<MutablePicoContainer>();
+ }
+ currentAppContainer.set(container);
+ }
+
+ protected void setRequestContainer(MutablePicoContainer container) {
+ if (currentRequestContainer == null) {
+ currentRequestContainer = new ThreadLocal<MutablePicoContainer>();
+ }
+ currentRequestContainer.set(container);
+ }
+
+ protected void setSessionContainer(MutablePicoContainer container) {
+ if (currentSessionContainer == null) {
+ currentSessionContainer = new ThreadLocal<MutablePicoContainer>();
+ }
+ currentSessionContainer.set(container);
+ }
+ }
+
+ public static class HttpSessionInjector extends AbstractAdapter {
+
+ public HttpSessionInjector() {
+ super(HttpSession.class, HttpSession.class);
+ }
+
+ public Object getComponentInstance(PicoContainer picoContainer, Type type) throws PicoCompositionException {
+ return currentSession.get();
+ }
+
+ public void verify(PicoContainer picoContainer) throws PicoCompositionException {
+ }
+
+ public String getDescriptor() {
+ return "HttpSessionInjector";
+ }
+ }
+
+ public static class HttpServletRequestInjector extends AbstractAdapter {
+
+ public HttpServletRequestInjector() {
+ super(HttpServletRequest.class, HttpServletRequest.class);
+ }
+
+ public Object getComponentInstance(PicoContainer picoContainer, Type type) throws PicoCompositionException {
+ return currentRequest.get();
+ }
+
+ public void verify(PicoContainer picoContainer) throws PicoCompositionException {
+ }
+
+ public String getDescriptor() {
+ return "HttpServletRequestInjector";
+ }
+ }
+
+ public static class HttpServletResponseInjector extends AbstractAdapter {
+
+ public HttpServletResponseInjector() {
+ super(HttpServletResponse.class, HttpServletResponse.class);
+ }
+
+ public Object getComponentInstance(PicoContainer picoContainer, Type type) throws PicoCompositionException {
+ return currentResponse.get();
+ }
+
+ public void verify(PicoContainer picoContainer) throws PicoCompositionException {
+ }
+
+ public String getDescriptor() {
+ return "HttpServletResponseInjector";
+ }
+ }
+}
Copied: java/2.x/tags/picocontainer-web-2.5.1/web-core/src/java/org/picocontainer/web/debug (from rev 5731, java/2.x/trunk/web/web-core/src/java/org/picocontainer/web/debug) ( => )
Deleted: java/2.x/tags/picocontainer-web-2.5.1/web-jsf/pom.xml
===================================================================
--- java/2.x/trunk/web/web-jsf/pom.xml 2010-07-04 23:00:58 UTC (rev 5730)
+++ java/2.x/tags/picocontainer-web-2.5.1/web-jsf/pom.xml 2010-07-12 03:06:15 UTC (rev 5733)
@@ -1,46 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.picocontainer.web</groupId>
- <artifactId>picocontainer-web</artifactId>
- <version>2.6-SNAPSHOT</version>
- </parent>
- <artifactId>picocontainer-web-jsf</artifactId>
- <name>PicoContainer Web JSF</name>
- <dependencies>
- <dependency>
- <groupId>org.picocontainer.web</groupId>
- <artifactId>picocontainer-web-core</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <version>1.2_02</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-legacy</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
Copied: java/2.x/tags/picocontainer-web-2.5.1/web-jsf/pom.xml (from rev 5732, java/2.x/trunk/web/web-jsf/pom.xml) (0 => 5733)
--- java/2.x/tags/picocontainer-web-2.5.1/web-jsf/pom.xml (rev 0)
+++ java/2.x/tags/picocontainer-web-2.5.1/web-jsf/pom.xml 2010-07-12 03:06:15 UTC (rev 5733)
@@ -0,0 +1,46 @@
+<?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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.picocontainer.web</groupId>
+ <artifactId>picocontainer-web</artifactId>
+ <version>2.5.1</version>
+ </parent>
+ <artifactId>picocontainer-web-jsf</artifactId>
+ <name>PicoContainer Web JSF</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.picocontainer.web</groupId>
+ <artifactId>picocontainer-web-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_02</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>jstl</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-legacy</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Deleted: java/2.x/tags/picocontainer-web-2.5.1/web-remoting/pom.xml (5730 => 5733)
--- java/2.x/trunk/web/web-remoting/pom.xml 2010-07-04 23:00:58 UTC (rev 5730)
+++ java/2.x/tags/picocontainer-web-2.5.1/web-remoting/pom.xml 2010-07-12 03:06:15 UTC (rev 5733)
@@ -1,76 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.picocontainer.web</groupId>
- <artifactId>picocontainer-web</artifactId>
- <version>2.6-SNAPSHOT</version>
- </parent>
- <artifactId>picocontainer-web-remoting</artifactId>
- <name>PicoContainer Web Remoting</name>
-
- <dependencies>
- <dependency>
- <groupId>org.picocontainer.web</groupId>
- <artifactId>picocontainer-web-core</artifactId>
- <version>${pom.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.picocontainer.script</groupId>
- <artifactId>picocontainer-script-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.paranamer</groupId>
- <artifactId>paranamer</artifactId>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>org.picocontainer.web</groupId>
- <artifactId>picocontainer-web-struts</artifactId>
- <version>${pom.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.picocontainer.web</groupId>
- <artifactId>picocontainer-web-struts2</artifactId>
- <version>${pom.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.picocontainer.web</groupId>
- <artifactId>picocontainer-web-webwork</artifactId>
- <version>${pom.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.picocontainer.web</groupId>
- <artifactId>picocontainer-web-webwork2</artifactId>
- <version>${pom.version}</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*TestCase.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: java/2.x/tags/picocontainer-web-2.5.1/web-remoting/pom.xml (from rev 5732, java/2.x/trunk/web/web-remoting/pom.xml) (0 => 5733)
--- java/2.x/tags/picocontainer-web-2.5.1/web-remoting/pom.xml (rev 0)
+++ java/2.x/tags/picocontainer-web-2.5.1/web-remoting/pom.xml 2010-07-12 03:06:15 UTC (rev 5733)
@@ -0,0 +1,76 @@
+<?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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.picocontainer.web</groupId>
+ <artifactId>picocontainer-web</artifactId>
+ <version>2.5.1</version>
+ </parent>
+ <artifactId>picocontainer-web-remoting</artifactId>
+ <name>PicoContainer Web Remoting</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.picocontainer.web</groupId>
+ <artifactId>picocontainer-web-core</artifactId>
+ <version>${pom.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.picocontainer.script</groupId>
+ <artifactId>picocontainer-script-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.paranamer</groupId>
+ <artifactId>paranamer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.picocontainer.web</groupId>
+ <artifactId>picocontainer-web-struts</artifactId>
+ <version>${pom.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.picocontainer.web</groupId>
+ <artifactId>picocontainer-web-struts2</artifactId>
+ <version>${pom.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.picocontainer.web</groupId>
+ <artifactId>picocontainer-web-webwork</artifactId>
+ <version>${pom.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.picocontainer.web</groupId>
+ <artifactId>picocontainer-web-webwork2</artifactId>
+ <version>${pom.version}</version>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*TestCase.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: java/2.x/tags/picocontainer-web-2.5.1/web-struts/pom.xml (5730 => 5733)
--- java/2.x/trunk/web/web-struts/pom.xml 2010-07-04 23:00:58 UTC (rev 5730)
+++ java/2.x/tags/picocontainer-web-2.5.1/web-struts/pom.xml 2010-07-12 03:06:15 UTC (rev 5733)
@@ -1,38 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.picocontainer.web</groupId>
- <artifactId>picocontainer-web</artifactId>
- <version>2.6-SNAPSHOT</version>
- </parent>
- <artifactId>picocontainer-web-struts</artifactId>
- <name>PicoContainer Web Struts</name>
- <dependencies>
- <dependency>
- <groupId>org.picocontainer.web</groupId>
- <artifactId>picocontainer-web-core</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts-taglib</artifactId>
- <version>1.3.8</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts-tiles</artifactId>
- <version>1.3.8</version>
- </dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jmock</groupId>
- <artifactId>jmock-legacy</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
Copied: java/2.x/tags/picocontainer-web-2.5.1/web-struts/pom.xml (from rev 5732, java/2.x/trunk/web/web-struts/pom.xml) (0 => 5733)
--- java/2.x/tags/picocontainer-web-2.5.1/web-struts/pom.xml (rev 0)
+++ java/2.x/tags/picocontainer-web-2.5.1/web-struts/pom.xml 2010-07-12 03:06:15 UTC (rev 5733)
@@ -0,0 +1,38 @@
+<?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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.picocontainer.web</groupId>
+ <artifactId>picocontainer-web</artifactId>
+ <version>2.5.1</version>
+ </parent>
+ <artifactId>picocontainer-web-struts</artifactId>
+ <name>PicoContainer Web Struts</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.picocontainer.web</groupId>
+ <artifactId>picocontainer-web-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts-taglib</artifactId>
+ <version>1.3.8</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts-tiles</artifactId>
+ <version>1.3.8</version>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-legacy</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Deleted: java/2.x/tags/picocontainer-web-2.5.1/web-struts2/pom.xml (5730 => 5733)
--- java/2.x/trunk/web/web-struts2/pom.xml 2010-07-04 23:00:58 UTC (rev 5730)
+++ java/2.x/tags/picocontainer-web-2.5.1/web-struts2/pom.xml 2010-07-12 03:06:15 UTC (rev 5733)
@@ -1,47 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.picocontainer.web</groupId>
- <artifactId>picocontainer-web</artifactId>
- <version>2.6-SNAPSHOT</version>
- </parent>
- <artifactId>picocontainer-web-struts2</artifactId>
- <name>PicoContainer Web Struts2</name>
- <dependencies>
- <dependency>
- <groupId>org.picocontainer.web</groupId>
- <artifactId>picocontainer-web-core</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.picocontainer</groupId>
- <artifactId>picocontainer-gems</artifactId>
- <optional>false</optional>
- </dependency>
- <dependency>
- <groupId>com.opensymphony</groupId>
- <artifactId>xwork</artifactId>
- <version>2.1.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.struts</groupId>
- <artifactId>struts2-core</artifactId>
- <version>2.1.6</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*TestCase.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: java/2.x/tags/picocontainer-web-2.5.1/web-struts2/pom.xml (from rev 5732, java/2.x/trunk/web/web-struts2/pom.xml) (0 => 5733)
--- java/2.x/tags/picocontainer-web-2.5.1/web-struts2/pom.xml (rev 0)
+++ java/2.x/tags/picocontainer-web-2.5.1/web-struts2/pom.xml 2010-07-12 03:06:15 UTC (rev 5733)
@@ -0,0 +1,47 @@
+<?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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.picocontainer.web</groupId>
+ <artifactId>picocontainer-web</artifactId>
+ <version>2.5.1</version>
+ </parent>
+ <artifactId>picocontainer-web-struts2</artifactId>
+ <name>PicoContainer Web Struts2</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.picocontainer.web</groupId>
+ <artifactId>picocontainer-web-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer-gems</artifactId>
+ <optional>false</optional>
+ </dependency>
+ <dependency>
+ <groupId>com.opensymphony</groupId>
+ <artifactId>xwork</artifactId>
+ <version>2.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-core</artifactId>
+ <version>2.1.6</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*TestCase.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: java/2.x/tags/picocontainer-web-2.5.1/web-webwork/pom.xml (5730 => 5733)
--- java/2.x/trunk/web/web-webwork/pom.xml 2010-07-04 23:00:58 UTC (rev 5730)
+++ java/2.x/tags/picocontainer-web-2.5.1/web-webwork/pom.xml 2010-07-12 03:06:15 UTC (rev 5733)
@@ -1,93 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.picocontainer.web</groupId>
- <artifactId>picocontainer-web</artifactId>
- <version>2.6-SNAPSHOT</version>
- </parent>
- <artifactId>picocontainer-web-webwork</artifactId>
- <name>PicoContainer Web WebWork</name>
- <dependencies>
- <dependency>
- <groupId>org.picocontainer.web</groupId>
- <artifactId>picocontainer-web-core</artifactId>
- <version>${pom.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>avalon-framework</artifactId>
- <groupId>avalon-framework</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.5</version>
- <exclusions>
- <exclusion>
- <artifactId>avalon-framework</artifactId>
- <groupId>avalon-framework</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>velocity-tools</groupId>
- <artifactId>velocity-tools-view</artifactId>
- <version>1.3</version>
- <exclusions>
- <exclusion>
- <artifactId>avalon-framework</artifactId>
- <groupId>avalon-framework</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>opensymphony</groupId>
- <artifactId>webwork</artifactId>
- <version>1.4</version>
- <exclusions>
- <exclusion>
- <artifactId>avalon-framework</artifactId>
- <groupId>avalon-framework</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>1.1</version>
- <exclusions>
- <exclusion>
- <artifactId>avalon-framework</artifactId>
- <groupId>avalon-framework</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1</version>
- <exclusions>
- <exclusion>
- <artifactId>avalon-framework</artifactId>
- <groupId>avalon-framework</groupId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*TestCase.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: java/2.x/tags/picocontainer-web-2.5.1/web-webwork/pom.xml (from rev 5732, java/2.x/trunk/web/web-webwork/pom.xml) (0 => 5733)
--- java/2.x/tags/picocontainer-web-2.5.1/web-webwork/pom.xml (rev 0)
+++ java/2.x/tags/picocontainer-web-2.5.1/web-webwork/pom.xml 2010-07-12 03:06:15 UTC (rev 5733)
@@ -0,0 +1,93 @@
+<?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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.picocontainer.web</groupId>
+ <artifactId>picocontainer-web</artifactId>
+ <version>2.5.1</version>
+ </parent>
+ <artifactId>picocontainer-web-webwork</artifactId>
+ <name>PicoContainer Web WebWork</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.picocontainer.web</groupId>
+ <artifactId>picocontainer-web-core</artifactId>
+ <version>${pom.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>avalon-framework</artifactId>
+ <groupId>avalon-framework</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.5</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>avalon-framework</artifactId>
+ <groupId>avalon-framework</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>velocity-tools</groupId>
+ <artifactId>velocity-tools-view</artifactId>
+ <version>1.3</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>avalon-framework</artifactId>
+ <groupId>avalon-framework</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>opensymphony</groupId>
+ <artifactId>webwork</artifactId>
+ <version>1.4</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>avalon-framework</artifactId>
+ <groupId>avalon-framework</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>avalon-framework</artifactId>
+ <groupId>avalon-framework</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>avalon-framework</artifactId>
+ <groupId>avalon-framework</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*TestCase.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: java/2.x/tags/picocontainer-web-2.5.1/web-webwork2/pom.xml (5730 => 5733)
--- java/2.x/trunk/web/web-webwork2/pom.xml 2010-07-04 23:00:58 UTC (rev 5730)
+++ java/2.x/tags/picocontainer-web-2.5.1/web-webwork2/pom.xml 2010-07-12 03:06:15 UTC (rev 5733)
@@ -1,47 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.picocontainer.web</groupId>
- <artifactId>picocontainer-web</artifactId>
- <version>2.6-SNAPSHOT</version>
- </parent>
- <artifactId>picocontainer-web-webwork2</artifactId>
- <name>PicoContainer Web WebWork2</name>
- <dependencies>
- <dependency>
- <groupId>org.picocontainer.web</groupId>
- <artifactId>picocontainer-web-core</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.picocontainer</groupId>
- <artifactId>picocontainer-gems</artifactId>
- <optional>false</optional>
- </dependency>
- <dependency>
- <groupId>opensymphony</groupId>
- <artifactId>xwork</artifactId>
- <version>1.2.2</version>
- </dependency>
- <dependency>
- <groupId>opensymphony</groupId>
- <artifactId>webwork</artifactId>
- <version>2.2.5</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/*TestCase.java</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: java/2.x/tags/picocontainer-web-2.5.1/web-webwork2/pom.xml (from rev 5732, java/2.x/trunk/web/web-webwork2/pom.xml) (0 => 5733)
--- java/2.x/tags/picocontainer-web-2.5.1/web-webwork2/pom.xml (rev 0)
+++ java/2.x/tags/picocontainer-web-2.5.1/web-webwork2/pom.xml 2010-07-12 03:06:15 UTC (rev 5733)
@@ -0,0 +1,47 @@
+<?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">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.picocontainer.web</groupId>
+ <artifactId>picocontainer-web</artifactId>
+ <version>2.5.1</version>
+ </parent>
+ <artifactId>picocontainer-web-webwork2</artifactId>
+ <name>PicoContainer Web WebWork2</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.picocontainer.web</groupId>
+ <artifactId>picocontainer-web-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.picocontainer</groupId>
+ <artifactId>picocontainer-gems</artifactId>
+ <optional>false</optional>
+ </dependency>
+ <dependency>
+ <groupId>opensymphony</groupId>
+ <artifactId>xwork</artifactId>
+ <version>1.2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>opensymphony</groupId>
+ <artifactId>webwork</artifactId>
+ <version>2.2.5</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>**/*TestCase.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
----------
To unsubscribe from this list please visit:
http://xircles.codehaus.org/manage_email