[picocontainer-scm] [5697] java/2.x/tags: [maven-release-plugin] copy for tag picocontainer-web-2.5
paul-yCVjj/[email protected]
| Newsgroups | gmane.comp.java.picocontainer.cvs |
|---|---|
| Message-ID | <[email protected]> |
Revision 5697
Author paul
Date 2010-06-27 15:13:37 -0500 (Sun, 27 Jun 2010)
Log Message
[maven-release-plugin] copy for tag picocontainer-web-2.5
Added Paths
- java/2.x/tags/picocontainer-web-2.5/
- java/2.x/tags/picocontainer-web-2.5/pom.xml
- java/2.x/tags/picocontainer-web-2.5/web-axis/pom.xml
- java/2.x/tags/picocontainer-web-2.5/web-core/pom.xml
- java/2.x/tags/picocontainer-web-2.5/web-jsf/pom.xml
- java/2.x/tags/picocontainer-web-2.5/web-remoting/pom.xml
- java/2.x/tags/picocontainer-web-2.5/web-remoting/src/java/org/picocontainer/web/remoting/AbstractPicoWebRemotingServlet.java
- java/2.x/tags/picocontainer-web-2.5/web-struts/pom.xml
- java/2.x/tags/picocontainer-web-2.5/web-struts2/pom.xml
- java/2.x/tags/picocontainer-web-2.5/web-webwork/pom.xml
- java/2.x/tags/picocontainer-web-2.5/web-webwork2/pom.xml
Removed Paths
- java/2.x/tags/picocontainer-web-2.5/pom.xml
- java/2.x/tags/picocontainer-web-2.5/web-axis/pom.xml
- java/2.x/tags/picocontainer-web-2.5/web-core/pom.xml
- java/2.x/tags/picocontainer-web-2.5/web-jsf/pom.xml
- java/2.x/tags/picocontainer-web-2.5/web-remoting/pom.xml
- java/2.x/tags/picocontainer-web-2.5/web-remoting/src/java/org/picocontainer/web/remoting/AbstractPicoWebRemotingServlet.java
- java/2.x/tags/picocontainer-web-2.5/web-struts/pom.xml
- java/2.x/tags/picocontainer-web-2.5/web-struts2/pom.xml
- java/2.x/tags/picocontainer-web-2.5/web-webwork/pom.xml
- java/2.x/tags/picocontainer-web-2.5/web-webwork2/pom.xml
Diff
Copied: java/2.x/tags/picocontainer-web-2.5 (from rev 5681, java/2.x/trunk/web) ( => )
Property changes on: java/2.x/tags/picocontainer-web-2.5
___________________________________________________________________
Name: svn:ignore
+ target
.project
.classpath
.settings
bin-groovy
target-eclipse
Name: svn:mergeinfo
+
Deleted: java/2.x/tags/picocontainer-web-2.5/pom.xml (5681 => 5697)
--- java/2.x/trunk/web/pom.xml 2010-05-24 13:25:45 UTC (rev 5681)
+++ java/2.x/tags/picocontainer-web-2.5/pom.xml 2010-06-27 20:13:37 UTC (rev 5697)
@@ -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.5-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.10.2</version>
- </dependency>
- <dependency>
- <groupId>org.picocontainer</groupId>
- <artifactId>picocontainer-gems</artifactId>
- <version>2.10.2</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.picocontainer.script</groupId>
- <artifactId>picocontainer-script-core</artifactId>
- <version>2.0</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.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.10.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.picocontainer.script</groupId>
- <artifactId>picocontainer-script-testmodel</artifactId>
- <version>2.0</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.picocontainer.script</groupId>
- <artifactId>picocontainer-script-groovy</artifactId>
- <version>2.0</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.1_3</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/pom.xml (from rev 5696, java/2.x/trunk/web/pom.xml) (0 => 5697)
--- java/2.x/tags/picocontainer-web-2.5/pom.xml (rev 0)
+++ java/2.x/tags/picocontainer-web-2.5/pom.xml 2010-06-27 20:13:37 UTC (rev 5697)
@@ -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</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</connection>
+ <developerConnection>scm:svn:https://svn.codehaus.org/picocontainer/java/2.x/tags/picocontainer-web-2.5</developerConnection>
+ <url>scm:svn:https://svn.codehaus.org/picocontainer/java/2.x/tags/picocontainer-web-2.5</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/web-axis/pom.xml (5681 => 5697)
--- java/2.x/trunk/web/web-axis/pom.xml 2010-05-24 13:25:45 UTC (rev 5681)
+++ java/2.x/tags/picocontainer-web-2.5/web-axis/pom.xml 2010-06-27 20:13:37 UTC (rev 5697)
@@ -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.5-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/web-axis/pom.xml (from rev 5696, java/2.x/trunk/web/web-axis/pom.xml) (0 => 5697)
--- java/2.x/tags/picocontainer-web-2.5/web-axis/pom.xml (rev 0)
+++ java/2.x/tags/picocontainer-web-2.5/web-axis/pom.xml 2010-06-27 20:13:37 UTC (rev 5697)
@@ -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</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/web-core/pom.xml (5681 => 5697)
--- java/2.x/trunk/web/web-core/pom.xml 2010-05-24 13:25:45 UTC (rev 5681)
+++ java/2.x/tags/picocontainer-web-2.5/web-core/pom.xml 2010-06-27 20:13:37 UTC (rev 5697)
@@ -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.5-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/web-core/pom.xml (from rev 5696, java/2.x/trunk/web/web-core/pom.xml) (0 => 5697)
--- java/2.x/tags/picocontainer-web-2.5/web-core/pom.xml (rev 0)
+++ java/2.x/tags/picocontainer-web-2.5/web-core/pom.xml 2010-06-27 20:13:37 UTC (rev 5697)
@@ -0,0 +1,41 @@
+<?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</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>
Deleted: java/2.x/tags/picocontainer-web-2.5/web-jsf/pom.xml (5681 => 5697)
--- java/2.x/trunk/web/web-jsf/pom.xml 2010-05-24 13:25:45 UTC (rev 5681)
+++ java/2.x/tags/picocontainer-web-2.5/web-jsf/pom.xml 2010-06-27 20:13:37 UTC (rev 5697)
@@ -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.5-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/web-jsf/pom.xml (from rev 5696, java/2.x/trunk/web/web-jsf/pom.xml) (0 => 5697)
--- java/2.x/tags/picocontainer-web-2.5/web-jsf/pom.xml (rev 0)
+++ java/2.x/tags/picocontainer-web-2.5/web-jsf/pom.xml 2010-06-27 20:13:37 UTC (rev 5697)
@@ -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</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/web-remoting/pom.xml (5681 => 5697)
--- java/2.x/trunk/web/web-remoting/pom.xml 2010-05-24 13:25:45 UTC (rev 5681)
+++ java/2.x/tags/picocontainer-web-2.5/web-remoting/pom.xml 2010-06-27 20:13:37 UTC (rev 5697)
@@ -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.5-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/web-remoting/pom.xml (from rev 5696, java/2.x/trunk/web/web-remoting/pom.xml) (0 => 5697)
--- java/2.x/tags/picocontainer-web-2.5/web-remoting/pom.xml (rev 0)
+++ java/2.x/tags/picocontainer-web-2.5/web-remoting/pom.xml 2010-06-27 20:13:37 UTC (rev 5697)
@@ -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</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/web-remoting/src/java/org/picocontainer/web/remoting/AbstractPicoWebRemotingServlet.java (5681 => 5697)
--- java/2.x/trunk/web/web-remoting/src/java/org/picocontainer/web/remoting/AbstractPicoWebRemotingServlet.java 2010-05-24 13:25:45 UTC (rev 5681)
+++ java/2.x/tags/picocontainer-web-2.5/web-remoting/src/java/org/picocontainer/web/remoting/AbstractPicoWebRemotingServlet.java 2010-06-27 20:13:37 UTC (rev 5697)
@@ -1,264 +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.remoting;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.lang.reflect.Member;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.picocontainer.ComponentAdapter;
-import org.picocontainer.ComponentMonitor;
-import org.picocontainer.MutablePicoContainer;
-import org.picocontainer.PicoContainer;
-import org.picocontainer.monitors.NullComponentMonitor;
-import org.picocontainer.web.PicoServletContainerFilter;
-import org.picocontainer.web.Cache;
-
-import com.thoughtworks.xstream.XStream;
-
-/**
- * Abstract Servlet used for the calling of methods in a tree of components managed by PicoContainer.
- * The form of the reply is determined by the XStream implementation passed into the constructor,
- * the request is plainly mapped from Query Strings and form fields to the method signature.
- *
- * @author Paul Hammant
- */
-@SuppressWarnings("serial")
-public abstract class AbstractPicoWebRemotingServlet extends HttpServlet {
-
- private static final String EMPTY = "";
- private static final String DOT = ".";
- private static final String COLON = ":";
- private static final String SPACE = " ";
- private static final String GET = "GET";
- private static final String CLOSE = "].";
- private static final String OPEN = "[";
- private static final String SLASH = "/";
- private static final String APPLICATION_SCOPE = "application";
- private static final String SESSION_SCOPE = "session";
- private static final String REQUEST_SCOPE = "request";
- private static final String SCOPES_TO_PUBLISH = "scopes_to_publish";
- private static final String PACKAGE_PREFIX_TO_STRIP = "package_prefix_to_strip";
- private static final String SUFFIX_TO_STRIP = "suffix_to_strip";
- private static final String MIME_TYPE = "mime_type";
- private static final String LOWER_CASE_PATH = "lower_case_path";
- private static final String USE_METHOD_NAME_PREFIXES_FOR_VERBS = "use_method_name_prefixes_for_verbs";
-
- private static ThreadLocal<MutablePicoContainer> currentRequestContainer = new ThreadLocal<MutablePicoContainer>();
- private static ThreadLocal<MutablePicoContainer> currentSessionContainer = new ThreadLocal<MutablePicoContainer>();
- private static ThreadLocal<MutablePicoContainer> currentAppContainer = new ThreadLocal<MutablePicoContainer>();
-
- private XStream xstream;
- private PicoWebRemoting pwr;
- private String mimeType = "text/plain";
- private PicoWebRemotingMonitor monitor;
-
- public static class ServletFilter extends PicoServletContainerFilter {
-
- @Override
- protected void setAppContainer(MutablePicoContainer container) {
- currentAppContainer.set(container);
- }
-
- @Override
- protected void setRequestContainer(MutablePicoContainer container) {
- currentRequestContainer.set(container);
- }
-
- @Override
- protected void setSessionContainer(MutablePicoContainer container) {
- currentSessionContainer.set(container);
- }
- }
-
- public static class Struts1ServletFilter
- extends org.picocontainer.web.struts.PicoActionFactory.ServletFilter {
- protected void setAppContainer(MutablePicoContainer container) {
- super.setAppContainer(container);
- currentAppContainer.set(container);
- }
-
- protected void setRequestContainer(MutablePicoContainer container) {
- super.setRequestContainer(container);
- currentRequestContainer.set(container);
- }
-
- protected void setSessionContainer(MutablePicoContainer container) {
- super.setSessionContainer(container);
- currentSessionContainer.set(container);
- }
- }
-
- public static class Struts2ServletFilter
- extends org.picocontainer.web.struts2.PicoObjectFactory.ServletFilter {
- protected void setAppContainer(MutablePicoContainer container) {
- super.setAppContainer(container);
- currentAppContainer.set(container);
- }
-
- protected void setRequestContainer(MutablePicoContainer container) {
- super.setRequestContainer(container);
- currentRequestContainer.set(container);
- }
-
- protected void setSessionContainer(MutablePicoContainer container) {
- super.setSessionContainer(container);
- currentSessionContainer.set(container);
- }
- }
-
- public static class WebWork1ServletFilter
- extends org.picocontainer.web.webwork.PicoActionFactory.ServletFilter {
- protected void setAppContainer(MutablePicoContainer container) {
- super.setAppContainer(container);
- currentAppContainer.set(container);
- }
-
- protected void setRequestContainer(MutablePicoContainer container) {
- super.setRequestContainer(container);
- currentRequestContainer.set(container);
- }
-
- protected void setSessionContainer(MutablePicoContainer container) {
- super.setSessionContainer(container);
- currentSessionContainer.set(container);
- }
- }
-
- public static class WebWork2ServletFilter
- extends org.picocontainer.web.webwork2.PicoObjectFactory.ServletFilter {
- protected void setAppContainer(MutablePicoContainer container) {
- super.setAppContainer(container);
- currentAppContainer.set(container);
- }
-
- protected void setRequestContainer(MutablePicoContainer container) {
- super.setRequestContainer(container);
- currentRequestContainer.set(container);
- }
-
- protected void setSessionContainer(MutablePicoContainer container) {
- super.setSessionContainer(container);
- currentSessionContainer.set(container);
- }
- }
-
- private boolean initialized;
-
- protected abstract XStream createXStream();
-
- @Override
- protected void service(HttpServletRequest request, HttpServletResponse response)
- throws IOException {
- if (!initialized) {
- publishAdapters();
- initialized = true;
- }
-
- respond(request, response, request.getPathInfo());
- }
-
- protected void respond(final HttpServletRequest request, HttpServletResponse response, String pathInfo) throws IOException {
- response.setContentType(mimeType);
-
- final String httpMethod = request.getMethod();
-
- String result = pwr.processRequest(pathInfo, currentRequestContainer.get(), httpMethod, new NullComponentMonitor() {
- @Override
- public Object invoking(PicoContainer container, ComponentAdapter<?> componentAdapter, Member member, Object instance, Object[] args) {
- return ComponentMonitor.KEEP;
- }
-
- public void invoked(PicoContainer container, ComponentAdapter<?> componentAdapter, Member member, Object instance, long duration, Object[] args, Object retVal) {
- }
- });
-
- PrintWriter writer = response.getWriter();
- if (result != null) {
- writer.print(result);
- } else {
- response.sendError(400, "Nothing is mapped to this URL, try removing the last term for directory list.");
- }
- }
-
- private void appendArgsAsString(StringBuilder sb, Object[] args) {
- for (int i = 0; i < args.length; i++) {
- Object arg = args[i];
- sb.append(SPACE).append(i).append(COLON).append(arg == null ? "**null**" : arg.toString());
- }
- }
-
- @Override
- public void init(ServletConfig servletConfig) throws ServletException {
- this.xstream = createXStream();
- String packagePrefixToStrip = servletConfig.getInitParameter(PACKAGE_PREFIX_TO_STRIP);
- String prefixToStripFromUrls;
- if (packagePrefixToStrip == null) {
- prefixToStripFromUrls = EMPTY;
- } else {
- prefixToStripFromUrls = packagePrefixToStrip.replace(DOT, SLASH) + SLASH;
- }
-
- String suffixToStrip = servletConfig.getInitParameter(SUFFIX_TO_STRIP);
-
- String scopesToPublish = servletConfig.getInitParameter(SCOPES_TO_PUBLISH);
- if (scopesToPublish == null) {
- scopesToPublish = EMPTY;
- }
- String mimeTypeFromConfig = servletConfig.getInitParameter(MIME_TYPE);
- if (mimeTypeFromConfig != null) {
- mimeType = mimeTypeFromConfig;
- }
-
- String lowerCasePathStr = servletConfig.getInitParameter(LOWER_CASE_PATH);
- boolean lowerCasePath;
- if (lowerCasePathStr == null) {
- lowerCasePath = false;
- } else {
- lowerCasePath = lowerCasePathStr.toLowerCase().equals(Boolean.TRUE.toString());
- }
-
- String useMethodNamePrefixesForVerbsStr = servletConfig.getInitParameter(USE_METHOD_NAME_PREFIXES_FOR_VERBS);
- boolean useMethodNamePrefixesForVerbs;
- if (useMethodNamePrefixesForVerbsStr == null) {
- useMethodNamePrefixesForVerbs = true;
- } else {
- useMethodNamePrefixesForVerbs = lowerCasePathStr.toLowerCase().equals(Boolean.TRUE.toString());
- }
-
- super.init(servletConfig);
- pwr = new PicoWebRemoting(xstream, prefixToStripFromUrls, suffixToStrip, scopesToPublish, lowerCasePath, useMethodNamePrefixesForVerbs);
- }
-
- private void publishAdapters() {
- pwr.publishAdapters(currentRequestContainer.get().getComponentAdapters(), REQUEST_SCOPE);
- MutablePicoContainer sessionContainer = currentSessionContainer.get();
- if (sessionContainer != null) {
- pwr.publishAdapters(sessionContainer.getComponentAdapters(), SESSION_SCOPE);
- }
- pwr.publishAdapters(currentAppContainer.get().getComponentAdapters(), APPLICATION_SCOPE);
-
- monitor = currentAppContainer.get().getComponent(PicoWebRemotingMonitor.class);
- if (monitor == null) {
- monitor = new NullPicoWebRemotingMonitor();
- }
- pwr.setMonitor(monitor);
- }
-
- protected void visitClass(String clazz, MethodVisitor mapv) throws IOException {
- pwr.visitClass(clazz, currentRequestContainer.get(), mapv);
- }
-
-}
Copied: java/2.x/tags/picocontainer-web-2.5/web-remoting/src/java/org/picocontainer/web/remoting/AbstractPicoWebRemotingServlet.java (from rev 5683, java/2.x/trunk/web/web-remoting/src/java/org/picocontainer/web/remoting/AbstractPicoWebRemotingServlet.java) (0 => 5697)
--- java/2.x/tags/picocontainer-web-2.5/web-remoting/src/java/org/picocontainer/web/remoting/AbstractPicoWebRemotingServlet.java (rev 0)
+++ java/2.x/tags/picocontainer-web-2.5/web-remoting/src/java/org/picocontainer/web/remoting/AbstractPicoWebRemotingServlet.java 2010-06-27 20:13:37 UTC (rev 5697)
@@ -0,0 +1,193 @@
+/*******************************************************************************
+ * 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.remoting;
+
+import java.io.IOException;
+import java.lang.reflect.Member;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.picocontainer.ComponentAdapter;
+import org.picocontainer.ComponentMonitor;
+import org.picocontainer.MutablePicoContainer;
+import org.picocontainer.PicoContainer;
+import org.picocontainer.monitors.NullComponentMonitor;
+import org.picocontainer.web.PicoServletContainerFilter;
+
+import com.thoughtworks.xstream.XStream;
+
+/**
+ * Abstract Servlet used for the calling of methods in a tree of components managed by PicoContainer.
+ * The form of the reply is determined by the XStream implementation passed into the constructor,
+ * the request is plainly mapped from Query Strings and form fields to the method signature.
+ *
+ * @author Paul Hammant
+ */
+@SuppressWarnings("serial")
+public abstract class AbstractPicoWebRemotingServlet extends HttpServlet {
+
+ private static final String EMPTY = "";
+ private static final String DOT = ".";
+ private static final String COLON = ":";
+ private static final String SPACE = " ";
+ private static final String GET = "GET";
+ private static final String CLOSE = "].";
+ private static final String OPEN = "[";
+ private static final String SLASH = "/";
+ private static final String APPLICATION_SCOPE = "application";
+ private static final String SESSION_SCOPE = "session";
+ private static final String REQUEST_SCOPE = "request";
+ private static final String SCOPES_TO_PUBLISH = "scopes_to_publish";
+ private static final String PACKAGE_PREFIX_TO_STRIP = "package_prefix_to_strip";
+ private static final String SUFFIX_TO_STRIP = "suffix_to_strip";
+ private static final String MIME_TYPE = "mime_type";
+ private static final String LOWER_CASE_PATH = "lower_case_path";
+ private static final String USE_METHOD_NAME_PREFIXES_FOR_VERBS = "use_method_name_prefixes_for_verbs";
+
+ private static ThreadLocal<MutablePicoContainer> currentRequestContainer = new ThreadLocal<MutablePicoContainer>();
+ private static ThreadLocal<MutablePicoContainer> currentSessionContainer = new ThreadLocal<MutablePicoContainer>();
+ private static ThreadLocal<MutablePicoContainer> currentAppContainer = new ThreadLocal<MutablePicoContainer>();
+
+ private XStream xstream;
+ private PicoWebRemoting pwr;
+ private String mimeType = "text/plain";
+ private PicoWebRemotingMonitor monitor;
+
+ public static class ServletFilter extends PicoServletContainerFilter {
+
+ @Override
+ protected void setAppContainer(MutablePicoContainer container) {
+ currentAppContainer.set(container);
+ }
+
+ @Override
+ protected void setRequestContainer(MutablePicoContainer container) {
+ currentRequestContainer.set(container);
+ }
+
+ @Override
+ protected void setSessionContainer(MutablePicoContainer container) {
+ currentSessionContainer.set(container);
+ }
+ }
+
+ private boolean initialized;
+
+ protected abstract XStream createXStream();
+
+ @Override
+ protected void service(HttpServletRequest request, HttpServletResponse response)
+ throws IOException {
+
+ if (!initialized) {
+ publishAdapters();
+ initialized = true;
+ }
+
+ respond(request, response, request.getPathInfo());
+ }
+
+ protected void respond(final HttpServletRequest request, HttpServletResponse response, String pathInfo) throws IOException {
+ response.setContentType(mimeType);
+
+ final String httpMethod = request.getMethod();
+
+ //final Cache cache = currentAppContainer.get().getComponent(Cache.class);
+
+ String result = pwr.processRequest(pathInfo, currentRequestContainer.get(), httpMethod, new NullComponentMonitor() {
+ @Override
+ public Object invoking(PicoContainer container, ComponentAdapter<?> componentAdapter, Member member, Object instance, Object[] args) {
+ return ComponentMonitor.KEEP;
+ }
+
+ @Override
+ public void invoked(PicoContainer container, ComponentAdapter<?> componentAdapter, Member member, Object instance, long duration, Object[] args, Object retVal) {
+ // Empty
+ }
+ });
+
+ if (result != null) {
+ response.getWriter().print(result);
+ } else {
+ response.sendError(400, "Nothing is mapped to this URL, try removing the last term for directory list.");
+ }
+ }
+
+ private void appendArgsAsString(StringBuilder sb, Object[] args) {
+ for (int i = 0; i < args.length; i++) {
+ Object arg = args[i];
+ sb.append(SPACE).append(i).append(COLON).append(arg == null ? "**null**" : arg.toString());
+ }
+ }
+
+ @Override
+ public void init(ServletConfig servletConfig) throws ServletException {
+ this.xstream = createXStream();
+ String packagePrefixToStrip = servletConfig.getInitParameter(PACKAGE_PREFIX_TO_STRIP);
+ String prefixToStripFromUrls;
+ if (packagePrefixToStrip == null) {
+ prefixToStripFromUrls = EMPTY;
+ } else {
+ prefixToStripFromUrls = packagePrefixToStrip.replace(DOT, SLASH) + SLASH;
+ }
+
+ String suffixToStrip = servletConfig.getInitParameter(SUFFIX_TO_STRIP);
+
+ String scopesToPublish = servletConfig.getInitParameter(SCOPES_TO_PUBLISH);
+ if (scopesToPublish == null) {
+ scopesToPublish = EMPTY;
+ }
+ String mimeTypeFromConfig = servletConfig.getInitParameter(MIME_TYPE);
+ if (mimeTypeFromConfig != null) {
+ mimeType = mimeTypeFromConfig;
+ }
+
+ String lowerCasePathStr = servletConfig.getInitParameter(LOWER_CASE_PATH);
+ boolean lowerCasePath;
+ if (lowerCasePathStr == null) {
+ lowerCasePath = false;
+ } else {
+ lowerCasePath = lowerCasePathStr.toLowerCase().equals(Boolean.TRUE.toString());
+ }
+
+ String useMethodNamePrefixesForVerbsStr = servletConfig.getInitParameter(USE_METHOD_NAME_PREFIXES_FOR_VERBS);
+ boolean useMethodNamePrefixesForVerbs;
+ if (useMethodNamePrefixesForVerbsStr == null) {
+ useMethodNamePrefixesForVerbs = true;
+ } else {
+ useMethodNamePrefixesForVerbs = lowerCasePathStr.toLowerCase().equals(Boolean.TRUE.toString());
+ }
+
+ super.init(servletConfig);
+ pwr = new PicoWebRemoting(xstream, prefixToStripFromUrls, suffixToStrip, scopesToPublish, lowerCasePath, useMethodNamePrefixesForVerbs);
+ }
+
+ private void publishAdapters() {
+ pwr.publishAdapters(currentRequestContainer.get().getComponentAdapters(), REQUEST_SCOPE);
+ MutablePicoContainer sessionContainer = currentSessionContainer.get();
+ if (sessionContainer != null) {
+ pwr.publishAdapters(sessionContainer.getComponentAdapters(), SESSION_SCOPE);
+ }
+ pwr.publishAdapters(currentAppContainer.get().getComponentAdapters(), APPLICATION_SCOPE);
+
+ monitor = currentAppContainer.get().getComponent(PicoWebRemotingMonitor.class);
+ if (monitor == null) {
+ monitor = new NullPicoWebRemotingMonitor();
+ }
+ pwr.setMonitor(monitor);
+ }
+
+ protected void visitClass(String clazz, MethodVisitor mapv) throws IOException {
+ pwr.visitClass(clazz, currentRequestContainer.get(), mapv);
+ }
+
+}
Deleted: java/2.x/tags/picocontainer-web-2.5/web-struts/pom.xml (5681 => 5697)
--- java/2.x/trunk/web/web-struts/pom.xml 2010-05-24 13:25:45 UTC (rev 5681)
+++ java/2.x/tags/picocontainer-web-2.5/web-struts/pom.xml 2010-06-27 20:13:37 UTC (rev 5697)
@@ -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.5-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/web-struts/pom.xml (from rev 5696, java/2.x/trunk/web/web-struts/pom.xml) (0 => 5697)
--- java/2.x/tags/picocontainer-web-2.5/web-struts/pom.xml (rev 0)
+++ java/2.x/tags/picocontainer-web-2.5/web-struts/pom.xml 2010-06-27 20:13:37 UTC (rev 5697)
@@ -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</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/web-struts2/pom.xml (5681 => 5697)
--- java/2.x/trunk/web/web-struts2/pom.xml 2010-05-24 13:25:45 UTC (rev 5681)
+++ java/2.x/tags/picocontainer-web-2.5/web-struts2/pom.xml 2010-06-27 20:13:37 UTC (rev 5697)
@@ -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.5-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/web-struts2/pom.xml (from rev 5696, java/2.x/trunk/web/web-struts2/pom.xml) (0 => 5697)
--- java/2.x/tags/picocontainer-web-2.5/web-struts2/pom.xml (rev 0)
+++ java/2.x/tags/picocontainer-web-2.5/web-struts2/pom.xml 2010-06-27 20:13:37 UTC (rev 5697)
@@ -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</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/web-webwork/pom.xml (5681 => 5697)
--- java/2.x/trunk/web/web-webwork/pom.xml 2010-05-24 13:25:45 UTC (rev 5681)
+++ java/2.x/tags/picocontainer-web-2.5/web-webwork/pom.xml 2010-06-27 20:13:37 UTC (rev 5697)
@@ -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.5-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/web-webwork/pom.xml (from rev 5696, java/2.x/trunk/web/web-webwork/pom.xml) (0 => 5697)
--- java/2.x/tags/picocontainer-web-2.5/web-webwork/pom.xml (rev 0)
+++ java/2.x/tags/picocontainer-web-2.5/web-webwork/pom.xml 2010-06-27 20:13:37 UTC (rev 5697)
@@ -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</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/web-webwork2/pom.xml (5681 => 5697)
--- java/2.x/trunk/web/web-webwork2/pom.xml 2010-05-24 13:25:45 UTC (rev 5681)
+++ java/2.x/tags/picocontainer-web-2.5/web-webwork2/pom.xml 2010-06-27 20:13:37 UTC (rev 5697)
@@ -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.5-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/web-webwork2/pom.xml (from rev 5696, java/2.x/trunk/web/web-webwork2/pom.xml) (0 => 5697)
--- java/2.x/tags/picocontainer-web-2.5/web-webwork2/pom.xml (rev 0)
+++ java/2.x/tags/picocontainer-web-2.5/web-webwork2/pom.xml 2010-06-27 20:13:37 UTC (rev 5697)
@@ -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</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