You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by Antonio Petrelli <an...@gmail.com> on 2007/12/17 10:37:57 UTC
Re: svn commit: r604801 - in /struts/struts2/trunk/assembly: pom.xml src/main/assembly/all.xml src/main/assembly/lib-backport.xml src/main/assembly/lib-jdk14.xml src/main/assembly/lib.xml
Don,
Why did you remove so many dependencies? I think that your commit broke the
assemblies instead of fixing them...
And why did you change the backported artifacts classifier to jdk14? I think
that the name was chosen by Ted (Husted) for a good reason (I suppose :-) ).
Ciao
Antonio
2007/12/17, mrdon@apache.org <mr...@apache.org>:
>
> Author: mrdon
> Date: Mon Dec 17 01:20:25 2007
> New Revision: 604801
>
> URL: http://svn.apache.org/viewvc?rev=604801&view=rev
> Log:
> Updating assemblies, adding all plugins to jdk14 zip
> WW-2379
>
> Added:
> struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml
> - copied, changed from r604783,
> struts/struts2/trunk/assembly/src/main/assembly/lib-backport.xml
> Removed:
> struts/struts2/trunk/assembly/src/main/assembly/lib-backport.xml
> Modified:
> struts/struts2/trunk/assembly/pom.xml
> struts/struts2/trunk/assembly/src/main/assembly/all.xml
> struts/struts2/trunk/assembly/src/main/assembly/lib.xml
>
> Modified: struts/struts2/trunk/assembly/pom.xml
> URL:
> http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?rev=604801&r1=604800&r2=604801&view=diff
>
> ==============================================================================
> --- struts/struts2/trunk/assembly/pom.xml (original)
> +++ struts/struts2/trunk/assembly/pom.xml Mon Dec 17 01:20:25 2007
> @@ -83,6 +83,12 @@
> </artifactItem>
> <artifactItem>
> <groupId>org.apache.struts</groupId>
>
> + <artifactId>struts2-rest-showcase</artifactId>
> + <version>${version}</version>
> + <type>war</type>
> + </artifactItem>
> + <artifactItem>
> + <groupId>org.apache.struts</groupId>
>
> <artifactId>struts2-mailreader</artifactId>
> <version>${version}</version>
> <type>war</type>
> @@ -100,10 +106,10 @@
> <configuration>
> <artifactItems>
> <artifactItem>
> - <groupId>opensymphony</groupId>
> + <groupId>com.opensymphony</groupId>
> <artifactId>xwork</artifactId>
> <classifier>javadoc</classifier>
> - <version>2.1-SNAPSHOT</version>
> + <version>2.1.1-SNAPSHOT</version>
> </artifactItem>
> </artifactItems>
> <outputDirectory>${project.build.directory
> }/xwork-apidocs</outputDirectory>
> @@ -124,7 +130,7 @@
> dest="${project.build.directory
> }/docs.zip"
> ignoreerrors="false"/>
> <unzip src="${project.build.directory
> }/docs.zip"
> - dest="${project.build.directory
> }/cwiki"/>
> + dest="${project.build.directory
> }/cwiki"/>
> </tasks>
> </configuration>
> <goals>
> @@ -140,7 +146,7 @@
> <descriptors>
>
> <descriptor>src/main/assembly/all.xml</descriptor>
>
> <descriptor>src/main/assembly/lib.xml</descriptor>
> - <descriptor>src/main/assembly/lib-backport.xml
> </descriptor>
> + <descriptor>src/main/assembly/lib-jdk14.xml
> </descriptor>
>
> <descriptor>src/main/assembly/apps.xml</descriptor>
>
> <descriptor>src/main/assembly/src.xml</descriptor>
>
> <descriptor>src/main/assembly/docs.xml</descriptor>
> @@ -155,40 +161,6 @@
>
> <dependencies>
>
> - <dependency>
> - <groupId>org.apache.struts</groupId>
> - <artifactId>struts2-api</artifactId>
> - <version>${version}</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.struts</groupId>
> - <artifactId>struts2-core</artifactId>
> - <version>${version}</version>
> - </dependency>
> -
> - <!-- Enable when XW-585 is resolved and XWork 2.1.1-SNAPSHOT is
> published.
> - See: http://jira.opensymphony.com/browse/XW-585
> -
> - <dependency>
> - <groupId>com.opensymphony</groupId>
> - <artifactId>xwork</artifactId>
> - <version>2.1.1-SNAPSHOT</version>
> - <classifier>backport</classifier>
> - <scope>runtime</scope>
> - </dependency> -->
> -
> - <dependency>
> - <groupId>org.apache.struts</groupId>
> - <artifactId>struts2-api</artifactId>
> - <version>${version}</version>
> - <classifier>backport</classifier>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.struts</groupId>
> - <artifactId>struts2-core</artifactId>
> - <version>${version}</version>
> - <classifier>backport</classifier>
> - </dependency>
>
> <dependency>
> <groupId>org.apache.struts</groupId>
> @@ -251,233 +223,104 @@
> </dependency>
>
> <dependency>
> - <groupId>org.apache.tiles</groupId>
> - <artifactId>tiles-jsp</artifactId>
> - <version>2.0.5</version>
> - <scope>runtime</scope>
> - </dependency>
> -
> - <dependency>
> - <groupId>net.sf.retrotranslator</groupId>
> - <artifactId>retrotranslator-runtime</artifactId>
> - <version>1.2.1</version>
> - <scope>runtime</scope>
> + <groupId>org.apache.struts</groupId>
> + <artifactId>struts2-rest-plugin</artifactId>
> + <version>${version}</version>
> </dependency>
>
> + <!-- Backported JDK 1.4 jars -->
> <dependency>
> - <groupId>backport-util-concurrent</groupId>
> - <artifactId>backport-util-concurrent</artifactId>
> - <version>3.0</version>
> + <groupId>com.opensymphony</groupId>
> + <artifactId>xwork</artifactId>
> + <version>2.1.1-SNAPSHOT</version>
> <scope>runtime</scope>
> - </dependency>
> -
> - <!-- Include optional dependencies -->
> - <dependency>
> - <groupId>javax.servlet</groupId>
> - <artifactId>jsp-api</artifactId>
> - <version>2.0</version>
> - <scope>provided</scope>
> + <classifier>jdk14</classifier>
> </dependency>
>
> <dependency>
> - <groupId>commons-lang</groupId>
> - <artifactId>commons-lang</artifactId>
> - <version>2.0</version>
> - <scope>provided</scope>
> - </dependency>
> -
> - <!-- Ajax -->
> - <dependency>
> - <groupId>uk.ltd.getahead</groupId>
> - <artifactId>dwr</artifactId>
> - <version>1.1-beta-3</version>
> - <scope>provided</scope>
> - </dependency>
> -
> - <!-- Velocity -->
> - <dependency>
> - <groupId>org.apache.velocity</groupId>
> - <artifactId>velocity</artifactId>
> - <version>1.5</version>
> - <scope>provided</scope>
> - </dependency>
> -
> - <dependency>
> - <groupId>org.apache.velocity</groupId>
> - <artifactId>velocity-tools</artifactId>
> - <version>1.3</version>
> - <scope>provided</scope>
> - </dependency>
> -
> - <!-- File upload -->
> - <dependency>
> - <groupId>commons-fileupload</groupId>
> - <artifactId>commons-fileupload</artifactId>
> - <version>1.1.1</version>
> - <scope>provided</scope>
> - </dependency>
> -
> - <!-- Sitemesh -->
> - <dependency>
> - <groupId>opensymphony</groupId>
> - <artifactId>sitemesh</artifactId>
> - <version>2.2.1</version>
> - <scope>provided</scope>
> - </dependency>
> -
> - <!-- Quickstart -->
> - <dependency>
> - <groupId>jetty</groupId>
> - <artifactId>org.mortbay.jetty</artifactId>
> - <version>5.1.4</version>
> - <scope>provided</scope>
> - </dependency>
> -
> - <dependency>
> - <groupId>eclipse</groupId>
> - <artifactId>jdtcore</artifactId>
> - <version>3.1.0</version>
> - <scope>provided</scope>
> - </dependency>
> -
> - <dependency>
> - <groupId>ant</groupId>
> - <artifactId>ant</artifactId>
> - <version>1.6.5</version>
> - <scope>provided</scope>
> - </dependency>
> -
> - <dependency>
> - <groupId>tomcat</groupId>
> - <artifactId>jasper-compiler</artifactId>
> - <version>5.5.12</version>
> - <scope>provided</scope>
> - </dependency>
> -
> - <dependency>
> - <groupId>tomcat</groupId>
> - <artifactId>jasper-runtime</artifactId>
> - <version>5.5.12</version>
> - <scope>provided</scope>
> - </dependency>
> -
> - <dependency>
> - <groupId>tomcat</groupId>
> - <artifactId>jasper-compiler-jdt</artifactId>
> - <version>5.5.12</version>
> - <scope>provided</scope>
> - </dependency>
> -
> - <dependency>
> - <groupId>commons-el</groupId>
> - <artifactId>commons-el</artifactId>
> - <version>1.0</version>
> - <scope>provided</scope>
> - </dependency>
> -
> - <dependency>
> - <groupId>commons-io</groupId>
> - <artifactId>commons-io</artifactId>
> - <version>1.0</version>
> - <scope>provided</scope>
> - </dependency>
> -
> - <dependency>
> - <groupId>commons-lang</groupId>
> - <artifactId>commons-lang</artifactId>
> - <version>2.1</version>
> - <scope>provided</scope>
> + <groupId>org.apache.struts</groupId>
> + <artifactId>struts2-core</artifactId>
> + <version>${version}</version>
> + <classifier>jdk14</classifier>
> </dependency>
>
> - <!-- QuickStart -->
> <dependency>
> - <groupId>xstream</groupId>
> - <artifactId>xstream</artifactId>
> - <version>1.1.2</version>
> - <scope>provided</scope>
> + <groupId>org.apache.struts</groupId>
> + <artifactId>struts2-config-browser-plugin</artifactId>
> + <version>${version}</version>
> + <classifier>jdk14</classifier>
> </dependency>
>
> <dependency>
> - <groupId>commons-digester</groupId>
> - <artifactId>commons-digester</artifactId>
> - <version>1.7</version>
> - <scope>provided</scope>
> + <groupId>org.apache.struts</groupId>
> + <artifactId>struts2-jasperreports-plugin</artifactId>
> + <version>${version}</version>
> + <classifier>jdk14</classifier>
> </dependency>
>
> - <!-- Portlet -->
> <dependency>
> - <groupId>portlet-api</groupId>
> - <artifactId>portlet-api</artifactId>
> - <version>1.0</version>
> - <scope>provided</scope>
> + <groupId>org.apache.struts</groupId>
> + <artifactId>struts2-jfreechart-plugin</artifactId>
> + <version>${version}</version>
> + <classifier>jdk14</classifier>
> </dependency>
>
> <dependency>
> - <groupId>org.apache.pluto</groupId>
> - <artifactId>pluto</artifactId>
> - <version>1.0.1-rc4</version>
> - <scope>provided</scope>
> + <groupId>org.apache.struts</groupId>
> + <artifactId>struts2-jsf-plugin</artifactId>
> + <version>${version}</version>
> + <classifier>jdk14</classifier>
> </dependency>
>
> - <!-- Plexus -->
> <dependency>
> - <groupId>org.codehaus.plexus</groupId>
> - <artifactId>plexus-container-default</artifactId>
> - <version>1.0-alpha-10</version>
> - <scope>provided</scope>
> + <groupId>org.apache.struts</groupId>
> + <artifactId>struts2-pell-multipart-plugin</artifactId>
> + <version>${version}</version>
> + <classifier>jdk14</classifier>
> </dependency>
>
> - <!-- Spring -->
> <dependency>
> - <groupId>org.springframework</groupId>
> - <artifactId>spring-beans</artifactId>
> - <version>2.0.7</version>
> - <scope>provided</scope>
> + <groupId>org.apache.struts</groupId>
> + <artifactId>struts2-plexus-plugin</artifactId>
> + <version>${version}</version>
> + <classifier>jdk14</classifier>
> </dependency>
>
> <dependency>
> - <groupId>org.springframework</groupId>
> - <artifactId>spring-core</artifactId>
> - <version>2.0.7</version>
> - <scope>provided</scope>
> + <groupId>org.apache.struts</groupId>
> + <artifactId>struts2-sitegraph-plugin</artifactId>
> + <version>${version}</version>
> + <classifier>jdk14</classifier>
> </dependency>
>
> <dependency>
> - <groupId>org.springframework</groupId>
> - <artifactId>spring-context</artifactId>
> - <version>2.0.7</version>
> - <scope>provided</scope>
> + <groupId>org.apache.struts</groupId>
> + <artifactId>struts2-sitemesh-plugin</artifactId>
> + <version>${version}</version>
> + <classifier>jdk14</classifier>
> </dependency>
>
> <dependency>
> - <groupId>org.springframework</groupId>
> - <artifactId>spring-web</artifactId>
> - <version>2.0.7</version>
> - <scope>provided</scope>
> + <groupId>org.apache.struts</groupId>
> + <artifactId>struts2-struts1-plugin</artifactId>
> + <version>${version}</version>
> + <classifier>jdk14</classifier>
> </dependency>
>
> <dependency>
> - <groupId>org.springframework</groupId>
> - <artifactId>spring-mock</artifactId>
> - <version>2.0.7</version>
> - <scope>provided</scope>
> + <groupId>org.apache.struts</groupId>
> + <artifactId>struts2-tiles-plugin</artifactId>
> + <version>${version}</version>
> + <classifier>jdk14</classifier>
> </dependency>
>
> -
> <dependency>
> - <groupId>myfaces</groupId>
> - <artifactId>myfaces-jsf-api</artifactId>
> - <version>1.0.9</version>
> - <scope>provided</scope>
> + <groupId>org.apache.struts</groupId>
> + <artifactId>struts2-rest-plugin</artifactId>
> + <version>${version}</version>
> + <classifier>jdk14</classifier>
> </dependency>
>
> - <!-- Exclude transitive dependencies -->
> - <dependency>
> - <groupId>javax.servlet</groupId>
> - <artifactId>servlet-api</artifactId>
> - <version>2.4</version>
> - <scope>provided</scope>
> - </dependency>
>
> </dependencies>
>
>
> Modified: struts/struts2/trunk/assembly/src/main/assembly/all.xml
> URL:
> http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/all.xml?rev=604801&r1=604800&r2=604801&view=diff
>
> ==============================================================================
> --- struts/struts2/trunk/assembly/src/main/assembly/all.xml (original)
> +++ struts/struts2/trunk/assembly/src/main/assembly/all.xml Mon Dec 17
> 01:20:25 2007
> @@ -28,8 +28,7 @@
> <outputDirectory>lib</outputDirectory>
> <scope>runtime</scope>
> <excludes>
> - <exclude>net.sf.retrotranslator:retrotranslator-runtime</exclude>
> - <exclude>*:backport</exclude>
> + <exclude>*:jdk14</exclude>
> </excludes>
> </dependencySet>
> </dependencySets>
> @@ -63,10 +62,6 @@
> <outputDirectory>docs</outputDirectory>
> </fileSet>
> <fileSet>
> - <directory>../api/target/site</directory>
> - <outputDirectory>docs/struts2-api</outputDirectory>
> - </fileSet>
> - <fileSet>
> <directory>../core/target/site</directory>
> <outputDirectory>docs/struts2-core</outputDirectory>
> </fileSet>
> @@ -153,15 +148,7 @@
> <include>pom.xml</include>
> <include>src/</include>
> </includes>
> - </fileSet>
> - <fileSet>
> - <directory>../api</directory>
> - <outputDirectory>src/api</outputDirectory>
> - <includes>
> - <include>pom.xml</include>
> - <include>src/</include>
> - </includes>
> - </fileSet>
> + </fileSet>
> <fileSet>
> <directory>../apps</directory>
> <outputDirectory>src/apps</outputDirectory>
>
> Copied: struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml(from r604783, struts/struts2/trunk/assembly/src/main/assembly/lib-
> backport.xml)
> URL:
> http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml?p2=struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml&p1=struts/struts2/trunk/assembly/src/main/assembly/lib-backport.xml&r1=604783&r2=604801&rev=604801&view=diff
>
> ==============================================================================
> --- struts/struts2/trunk/assembly/src/main/assembly/lib-backport.xml(original)
> +++ struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml Mon Dec
> 17 01:20:25 2007
> @@ -19,33 +19,31 @@
> -->
>
> <assembly>
> - <id>lib-backport</id>
> + <id>lib-jdk14</id>
> <formats>
> <format>zip</format>
> </formats>
> <dependencySets>
> - <dependencySet>
> - <outputDirectory>backport</outputDirectory>
> + <dependencySet useTransitiveFiltering="true">
> + <outputDirectory>jdk14</outputDirectory>
>
> <outputFileNameMapping>${artifactId}-${version}.${extension}</outputFileNameMapping>
> - <includes>
> - <include>net.sf.retrotranslator:retrotranslator-runtime</include>
>
> - <include>backport-util-concurrent:backport-util-concurrent</include>
> - </includes>
> + <excludes>
> + <exclude>org.apache.struts:*:jar</exclude>
> + <exclude>*xwork*</exclude>
> + </excludes>
> </dependencySet>
> - <dependencySet>
> - <outputDirectory>backport</outputDirectory>
>
> - <outputFileNameMapping>${artifactId}-${version}-backport.${extension}</outputFileNameMapping>
> + <dependencySet useTransitiveFiltering="true">
> + <outputDirectory>jdk14</outputDirectory>
>
> + <outputFileNameMapping>${artifactId}-${version}-jdk14.${extension}</outputFileNameMapping>
> <includes>
> - <include>org.apache.struts:struts2-api:jar:backport</include>
> - <include>org.apache.struts:struts2-core:jar:backport</include>
> - <include>com.opensymphony:xwork:jar:backport</include>
> + <include>*:jdk14</include>
> </includes>
> </dependencySet>
> </dependencySets>
> <fileSets>
> <fileSet>
> - <directory>../backport</directory>
> - <outputDirectory>backport</outputDirectory>
> + <directory>../jdk14</directory>
> + <outputDirectory>jdk14</outputDirectory>
> <includes>
> <include>README*</include>
> <include>*LICENSE*</include>
>
> Modified: struts/struts2/trunk/assembly/src/main/assembly/lib.xml
> URL:
> http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/lib.xml?rev=604801&r1=604800&r2=604801&view=diff
>
> ==============================================================================
> --- struts/struts2/trunk/assembly/src/main/assembly/lib.xml (original)
> +++ struts/struts2/trunk/assembly/src/main/assembly/lib.xml Mon Dec 17
> 01:20:25 2007
> @@ -28,8 +28,7 @@
> <outputDirectory>lib</outputDirectory>
> <scope>runtime</scope>
> <excludes>
> - <exclude>net.sf.retrotranslator:retrotranslator-runtime</exclude>
> - <exclude>*:backport</exclude>
> + <exclude>*:jdk14</exclude>
> </excludes>
> </dependencySet>
> </dependencySets>
>
>
>
Re: svn commit: r604801 - in /struts/struts2/trunk/assembly: pom.xml src/main/assembly/all.xml src/main/assembly/lib-backport.xml src/main/assembly/lib-jdk14.xml src/main/assembly/lib.xml
Posted by Antonio Petrelli <an...@gmail.com>.
2007/12/17, Don Brown <mr...@twdata.org>:
>
> On 12/17/07, Antonio Petrelli <an...@gmail.com> wrote:
> > Mmm I think that you removed Tiles for no good reason....
>
> Nope, I just checked - Tiles is still there in -all, -lib, and
> -lib-jdk14. You don't need to specify the jar explicitly, as it is
> pulled in via the tiles plugin.
The Struts 2/Tiles 2 plugin does not depend on tiles-jsp, so I suppose that
it isn't there...
BTW, I noticed that you removed the backport-utils and
retrotranslator-runtime dependencies: are they still there in backport
assemblies? (Sorry for the question but at the moment I cannot test myself).
One of the advantages of the plugin system is we don't have to use
> optional jars all over the place. It was the optional jars that were
> requiring us to declare dependencies in multiple places, but now that
> they are required by the plugins, they are properly retrieved with no
> extra work.
Ok sorry for not understanding...
As I said, we'll probably have to add a few back for the couple cases
> where the jars were optional and we want them in the zips, but getting
> rid of all that duplication will help make the build more maintainable
> and less error-prone.
I don't like the approach. I think it is best to create assemblies on your
local machine by removing all the unneeded dependencies to clean up the pom
and the assembly descriptors, until the assemblies are exactly the same as
they were before your intervention.
After that, we could discuss the removal of dependencies and jars from the
distributions.
Thanks
Antonio
Re: svn commit: r604801 - in /struts/struts2/trunk/assembly: pom.xml src/main/assembly/all.xml src/main/assembly/lib-backport.xml src/main/assembly/lib-jdk14.xml src/main/assembly/lib.xml
Posted by Don Brown <mr...@twdata.org>.
On 12/17/07, Antonio Petrelli <an...@gmail.com> wrote:
> Mmm I think that you removed Tiles for no good reason....
Nope, I just checked - Tiles is still there in -all, -lib, and
-lib-jdk14. You don't need to specify the jar explicitly, as it is
pulled in via the tiles plugin.
One of the advantages of the plugin system is we don't have to use
optional jars all over the place. It was the optional jars that were
requiring us to declare dependencies in multiple places, but now that
they are required by the plugins, they are properly retrieved with no
extra work.
As I said, we'll probably have to add a few back for the couple cases
where the jars were optional and we want them in the zips, but getting
rid of all that duplication will help make the build more maintainable
and less error-prone.
Don
>
> Antonio
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
Re: svn commit: r604801 - in /struts/struts2/trunk/assembly: pom.xml src/main/assembly/all.xml src/main/assembly/lib-backport.xml src/main/assembly/lib-jdk14.xml src/main/assembly/lib.xml
Posted by Antonio Petrelli <an...@gmail.com>.
2007/12/17, Don Brown <mr...@twdata.org>:
>
> On 12/17/07, Antonio Petrelli <an...@gmail.com> wrote:
> > Don,
> > Why did you remove so many dependencies? I think that your commit broke
> the
> > assemblies instead of fixing them...
>
> Most of those were not used anymore, but I'm sure I'll have to put
> back in. I'd rather know exactly what needs to go there than have a
> bunch of stuff no one is quite sure about.
Mmm I think that you removed Tiles for no good reason....
Antonio
Re: svn commit: r604801 - in /struts/struts2/trunk/assembly: pom.xml src/main/assembly/all.xml src/main/assembly/lib-backport.xml src/main/assembly/lib-jdk14.xml src/main/assembly/lib.xml
Posted by Don Brown <mr...@twdata.org>.
On 12/17/07, Antonio Petrelli <an...@gmail.com> wrote:
> Don,
> Why did you remove so many dependencies? I think that your commit broke the
> assemblies instead of fixing them...
Most of those were not used anymore, but I'm sure I'll have to put
back in. I'd rather know exactly what needs to go there than have a
bunch of stuff no one is quite sure about.
For example, there were spring jars, but those shouldn't be defined
here, as the spring plugin will pull them in automatically. That
leads me to think they were from the pre-plugin days.
> And why did you change the backported artifacts classifier to jdk14? I think
> that the name was chosen by Ted (Husted) for a good reason (I suppose :-) ).
Well, that is the default and couldn't think of a good reason to not
use it. I actually did the xwork build first, and then copy/pasted.
To me, backport is too generic, where the -jdk14 classifier is pretty
clear what it is. Still, I'd don't really care, as long as it is
consistent and it seemed to me jdk14 is more consistent with both
xwork and the maven world at large.
Don
>
> Ciao
> Antonio
>
> 2007/12/17, mrdon@apache.org <mr...@apache.org>:
> >
> > Author: mrdon
> > Date: Mon Dec 17 01:20:25 2007
> > New Revision: 604801
> >
> > URL: http://svn.apache.org/viewvc?rev=604801&view=rev
> > Log:
> > Updating assemblies, adding all plugins to jdk14 zip
> > WW-2379
> >
> > Added:
> > struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml
> > - copied, changed from r604783,
> > struts/struts2/trunk/assembly/src/main/assembly/lib-backport.xml
> > Removed:
> > struts/struts2/trunk/assembly/src/main/assembly/lib-backport.xml
> > Modified:
> > struts/struts2/trunk/assembly/pom.xml
> > struts/struts2/trunk/assembly/src/main/assembly/all.xml
> > struts/struts2/trunk/assembly/src/main/assembly/lib.xml
> >
> > Modified: struts/struts2/trunk/assembly/pom.xml
> > URL:
> > http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?rev=604801&r1=604800&r2=604801&view=diff
> >
> > ==============================================================================
> > --- struts/struts2/trunk/assembly/pom.xml (original)
> > +++ struts/struts2/trunk/assembly/pom.xml Mon Dec 17 01:20:25 2007
> > @@ -83,6 +83,12 @@
> > </artifactItem>
> > <artifactItem>
> > <groupId>org.apache.struts</groupId>
> >
> > + <artifactId>struts2-rest-showcase</artifactId>
> > + <version>${version}</version>
> > + <type>war</type>
> > + </artifactItem>
> > + <artifactItem>
> > + <groupId>org.apache.struts</groupId>
> >
> > <artifactId>struts2-mailreader</artifactId>
> > <version>${version}</version>
> > <type>war</type>
> > @@ -100,10 +106,10 @@
> > <configuration>
> > <artifactItems>
> > <artifactItem>
> > - <groupId>opensymphony</groupId>
> > + <groupId>com.opensymphony</groupId>
> > <artifactId>xwork</artifactId>
> > <classifier>javadoc</classifier>
> > - <version>2.1-SNAPSHOT</version>
> > + <version>2.1.1-SNAPSHOT</version>
> > </artifactItem>
> > </artifactItems>
> > <outputDirectory>${project.build.directory
> > }/xwork-apidocs</outputDirectory>
> > @@ -124,7 +130,7 @@
> > dest="${project.build.directory
> > }/docs.zip"
> > ignoreerrors="false"/>
> > <unzip src="${project.build.directory
> > }/docs.zip"
> > - dest="${project.build.directory
> > }/cwiki"/>
> > + dest="${project.build.directory
> > }/cwiki"/>
> > </tasks>
> > </configuration>
> > <goals>
> > @@ -140,7 +146,7 @@
> > <descriptors>
> >
> > <descriptor>src/main/assembly/all.xml</descriptor>
> >
> > <descriptor>src/main/assembly/lib.xml</descriptor>
> > - <descriptor>src/main/assembly/lib-backport.xml
> > </descriptor>
> > + <descriptor>src/main/assembly/lib-jdk14.xml
> > </descriptor>
> >
> > <descriptor>src/main/assembly/apps.xml</descriptor>
> >
> > <descriptor>src/main/assembly/src.xml</descriptor>
> >
> > <descriptor>src/main/assembly/docs.xml</descriptor>
> > @@ -155,40 +161,6 @@
> >
> > <dependencies>
> >
> > - <dependency>
> > - <groupId>org.apache.struts</groupId>
> > - <artifactId>struts2-api</artifactId>
> > - <version>${version}</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>org.apache.struts</groupId>
> > - <artifactId>struts2-core</artifactId>
> > - <version>${version}</version>
> > - </dependency>
> > -
> > - <!-- Enable when XW-585 is resolved and XWork 2.1.1-SNAPSHOT is
> > published.
> > - See: http://jira.opensymphony.com/browse/XW-585
> > -
> > - <dependency>
> > - <groupId>com.opensymphony</groupId>
> > - <artifactId>xwork</artifactId>
> > - <version>2.1.1-SNAPSHOT</version>
> > - <classifier>backport</classifier>
> > - <scope>runtime</scope>
> > - </dependency> -->
> > -
> > - <dependency>
> > - <groupId>org.apache.struts</groupId>
> > - <artifactId>struts2-api</artifactId>
> > - <version>${version}</version>
> > - <classifier>backport</classifier>
> > - </dependency>
> > - <dependency>
> > - <groupId>org.apache.struts</groupId>
> > - <artifactId>struts2-core</artifactId>
> > - <version>${version}</version>
> > - <classifier>backport</classifier>
> > - </dependency>
> >
> > <dependency>
> > <groupId>org.apache.struts</groupId>
> > @@ -251,233 +223,104 @@
> > </dependency>
> >
> > <dependency>
> > - <groupId>org.apache.tiles</groupId>
> > - <artifactId>tiles-jsp</artifactId>
> > - <version>2.0.5</version>
> > - <scope>runtime</scope>
> > - </dependency>
> > -
> > - <dependency>
> > - <groupId>net.sf.retrotranslator</groupId>
> > - <artifactId>retrotranslator-runtime</artifactId>
> > - <version>1.2.1</version>
> > - <scope>runtime</scope>
> > + <groupId>org.apache.struts</groupId>
> > + <artifactId>struts2-rest-plugin</artifactId>
> > + <version>${version}</version>
> > </dependency>
> >
> > + <!-- Backported JDK 1.4 jars -->
> > <dependency>
> > - <groupId>backport-util-concurrent</groupId>
> > - <artifactId>backport-util-concurrent</artifactId>
> > - <version>3.0</version>
> > + <groupId>com.opensymphony</groupId>
> > + <artifactId>xwork</artifactId>
> > + <version>2.1.1-SNAPSHOT</version>
> > <scope>runtime</scope>
> > - </dependency>
> > -
> > - <!-- Include optional dependencies -->
> > - <dependency>
> > - <groupId>javax.servlet</groupId>
> > - <artifactId>jsp-api</artifactId>
> > - <version>2.0</version>
> > - <scope>provided</scope>
> > + <classifier>jdk14</classifier>
> > </dependency>
> >
> > <dependency>
> > - <groupId>commons-lang</groupId>
> > - <artifactId>commons-lang</artifactId>
> > - <version>2.0</version>
> > - <scope>provided</scope>
> > - </dependency>
> > -
> > - <!-- Ajax -->
> > - <dependency>
> > - <groupId>uk.ltd.getahead</groupId>
> > - <artifactId>dwr</artifactId>
> > - <version>1.1-beta-3</version>
> > - <scope>provided</scope>
> > - </dependency>
> > -
> > - <!-- Velocity -->
> > - <dependency>
> > - <groupId>org.apache.velocity</groupId>
> > - <artifactId>velocity</artifactId>
> > - <version>1.5</version>
> > - <scope>provided</scope>
> > - </dependency>
> > -
> > - <dependency>
> > - <groupId>org.apache.velocity</groupId>
> > - <artifactId>velocity-tools</artifactId>
> > - <version>1.3</version>
> > - <scope>provided</scope>
> > - </dependency>
> > -
> > - <!-- File upload -->
> > - <dependency>
> > - <groupId>commons-fileupload</groupId>
> > - <artifactId>commons-fileupload</artifactId>
> > - <version>1.1.1</version>
> > - <scope>provided</scope>
> > - </dependency>
> > -
> > - <!-- Sitemesh -->
> > - <dependency>
> > - <groupId>opensymphony</groupId>
> > - <artifactId>sitemesh</artifactId>
> > - <version>2.2.1</version>
> > - <scope>provided</scope>
> > - </dependency>
> > -
> > - <!-- Quickstart -->
> > - <dependency>
> > - <groupId>jetty</groupId>
> > - <artifactId>org.mortbay.jetty</artifactId>
> > - <version>5.1.4</version>
> > - <scope>provided</scope>
> > - </dependency>
> > -
> > - <dependency>
> > - <groupId>eclipse</groupId>
> > - <artifactId>jdtcore</artifactId>
> > - <version>3.1.0</version>
> > - <scope>provided</scope>
> > - </dependency>
> > -
> > - <dependency>
> > - <groupId>ant</groupId>
> > - <artifactId>ant</artifactId>
> > - <version>1.6.5</version>
> > - <scope>provided</scope>
> > - </dependency>
> > -
> > - <dependency>
> > - <groupId>tomcat</groupId>
> > - <artifactId>jasper-compiler</artifactId>
> > - <version>5.5.12</version>
> > - <scope>provided</scope>
> > - </dependency>
> > -
> > - <dependency>
> > - <groupId>tomcat</groupId>
> > - <artifactId>jasper-runtime</artifactId>
> > - <version>5.5.12</version>
> > - <scope>provided</scope>
> > - </dependency>
> > -
> > - <dependency>
> > - <groupId>tomcat</groupId>
> > - <artifactId>jasper-compiler-jdt</artifactId>
> > - <version>5.5.12</version>
> > - <scope>provided</scope>
> > - </dependency>
> > -
> > - <dependency>
> > - <groupId>commons-el</groupId>
> > - <artifactId>commons-el</artifactId>
> > - <version>1.0</version>
> > - <scope>provided</scope>
> > - </dependency>
> > -
> > - <dependency>
> > - <groupId>commons-io</groupId>
> > - <artifactId>commons-io</artifactId>
> > - <version>1.0</version>
> > - <scope>provided</scope>
> > - </dependency>
> > -
> > - <dependency>
> > - <groupId>commons-lang</groupId>
> > - <artifactId>commons-lang</artifactId>
> > - <version>2.1</version>
> > - <scope>provided</scope>
> > + <groupId>org.apache.struts</groupId>
> > + <artifactId>struts2-core</artifactId>
> > + <version>${version}</version>
> > + <classifier>jdk14</classifier>
> > </dependency>
> >
> > - <!-- QuickStart -->
> > <dependency>
> > - <groupId>xstream</groupId>
> > - <artifactId>xstream</artifactId>
> > - <version>1.1.2</version>
> > - <scope>provided</scope>
> > + <groupId>org.apache.struts</groupId>
> > + <artifactId>struts2-config-browser-plugin</artifactId>
> > + <version>${version}</version>
> > + <classifier>jdk14</classifier>
> > </dependency>
> >
> > <dependency>
> > - <groupId>commons-digester</groupId>
> > - <artifactId>commons-digester</artifactId>
> > - <version>1.7</version>
> > - <scope>provided</scope>
> > + <groupId>org.apache.struts</groupId>
> > + <artifactId>struts2-jasperreports-plugin</artifactId>
> > + <version>${version}</version>
> > + <classifier>jdk14</classifier>
> > </dependency>
> >
> > - <!-- Portlet -->
> > <dependency>
> > - <groupId>portlet-api</groupId>
> > - <artifactId>portlet-api</artifactId>
> > - <version>1.0</version>
> > - <scope>provided</scope>
> > + <groupId>org.apache.struts</groupId>
> > + <artifactId>struts2-jfreechart-plugin</artifactId>
> > + <version>${version}</version>
> > + <classifier>jdk14</classifier>
> > </dependency>
> >
> > <dependency>
> > - <groupId>org.apache.pluto</groupId>
> > - <artifactId>pluto</artifactId>
> > - <version>1.0.1-rc4</version>
> > - <scope>provided</scope>
> > + <groupId>org.apache.struts</groupId>
> > + <artifactId>struts2-jsf-plugin</artifactId>
> > + <version>${version}</version>
> > + <classifier>jdk14</classifier>
> > </dependency>
> >
> > - <!-- Plexus -->
> > <dependency>
> > - <groupId>org.codehaus.plexus</groupId>
> > - <artifactId>plexus-container-default</artifactId>
> > - <version>1.0-alpha-10</version>
> > - <scope>provided</scope>
> > + <groupId>org.apache.struts</groupId>
> > + <artifactId>struts2-pell-multipart-plugin</artifactId>
> > + <version>${version}</version>
> > + <classifier>jdk14</classifier>
> > </dependency>
> >
> > - <!-- Spring -->
> > <dependency>
> > - <groupId>org.springframework</groupId>
> > - <artifactId>spring-beans</artifactId>
> > - <version>2.0.7</version>
> > - <scope>provided</scope>
> > + <groupId>org.apache.struts</groupId>
> > + <artifactId>struts2-plexus-plugin</artifactId>
> > + <version>${version}</version>
> > + <classifier>jdk14</classifier>
> > </dependency>
> >
> > <dependency>
> > - <groupId>org.springframework</groupId>
> > - <artifactId>spring-core</artifactId>
> > - <version>2.0.7</version>
> > - <scope>provided</scope>
> > + <groupId>org.apache.struts</groupId>
> > + <artifactId>struts2-sitegraph-plugin</artifactId>
> > + <version>${version}</version>
> > + <classifier>jdk14</classifier>
> > </dependency>
> >
> > <dependency>
> > - <groupId>org.springframework</groupId>
> > - <artifactId>spring-context</artifactId>
> > - <version>2.0.7</version>
> > - <scope>provided</scope>
> > + <groupId>org.apache.struts</groupId>
> > + <artifactId>struts2-sitemesh-plugin</artifactId>
> > + <version>${version}</version>
> > + <classifier>jdk14</classifier>
> > </dependency>
> >
> > <dependency>
> > - <groupId>org.springframework</groupId>
> > - <artifactId>spring-web</artifactId>
> > - <version>2.0.7</version>
> > - <scope>provided</scope>
> > + <groupId>org.apache.struts</groupId>
> > + <artifactId>struts2-struts1-plugin</artifactId>
> > + <version>${version}</version>
> > + <classifier>jdk14</classifier>
> > </dependency>
> >
> > <dependency>
> > - <groupId>org.springframework</groupId>
> > - <artifactId>spring-mock</artifactId>
> > - <version>2.0.7</version>
> > - <scope>provided</scope>
> > + <groupId>org.apache.struts</groupId>
> > + <artifactId>struts2-tiles-plugin</artifactId>
> > + <version>${version}</version>
> > + <classifier>jdk14</classifier>
> > </dependency>
> >
> > -
> > <dependency>
> > - <groupId>myfaces</groupId>
> > - <artifactId>myfaces-jsf-api</artifactId>
> > - <version>1.0.9</version>
> > - <scope>provided</scope>
> > + <groupId>org.apache.struts</groupId>
> > + <artifactId>struts2-rest-plugin</artifactId>
> > + <version>${version}</version>
> > + <classifier>jdk14</classifier>
> > </dependency>
> >
> > - <!-- Exclude transitive dependencies -->
> > - <dependency>
> > - <groupId>javax.servlet</groupId>
> > - <artifactId>servlet-api</artifactId>
> > - <version>2.4</version>
> > - <scope>provided</scope>
> > - </dependency>
> >
> > </dependencies>
> >
> >
> > Modified: struts/struts2/trunk/assembly/src/main/assembly/all.xml
> > URL:
> > http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/all.xml?rev=604801&r1=604800&r2=604801&view=diff
> >
> > ==============================================================================
> > --- struts/struts2/trunk/assembly/src/main/assembly/all.xml (original)
> > +++ struts/struts2/trunk/assembly/src/main/assembly/all.xml Mon Dec 17
> > 01:20:25 2007
> > @@ -28,8 +28,7 @@
> > <outputDirectory>lib</outputDirectory>
> > <scope>runtime</scope>
> > <excludes>
> > - <exclude>net.sf.retrotranslator:retrotranslator-runtime</exclude>
> > - <exclude>*:backport</exclude>
> > + <exclude>*:jdk14</exclude>
> > </excludes>
> > </dependencySet>
> > </dependencySets>
> > @@ -63,10 +62,6 @@
> > <outputDirectory>docs</outputDirectory>
> > </fileSet>
> > <fileSet>
> > - <directory>../api/target/site</directory>
> > - <outputDirectory>docs/struts2-api</outputDirectory>
> > - </fileSet>
> > - <fileSet>
> > <directory>../core/target/site</directory>
> > <outputDirectory>docs/struts2-core</outputDirectory>
> > </fileSet>
> > @@ -153,15 +148,7 @@
> > <include>pom.xml</include>
> > <include>src/</include>
> > </includes>
> > - </fileSet>
> > - <fileSet>
> > - <directory>../api</directory>
> > - <outputDirectory>src/api</outputDirectory>
> > - <includes>
> > - <include>pom.xml</include>
> > - <include>src/</include>
> > - </includes>
> > - </fileSet>
> > + </fileSet>
> > <fileSet>
> > <directory>../apps</directory>
> > <outputDirectory>src/apps</outputDirectory>
> >
> > Copied: struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml(from r604783, struts/struts2/trunk/assembly/src/main/assembly/lib-
> > backport.xml)
> > URL:
> > http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml?p2=struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml&p1=struts/struts2/trunk/assembly/src/main/assembly/lib-backport.xml&r1=604783&r2=604801&rev=604801&view=diff
> >
> > ==============================================================================
> > --- struts/struts2/trunk/assembly/src/main/assembly/lib-backport.xml(original)
> > +++ struts/struts2/trunk/assembly/src/main/assembly/lib-jdk14.xml Mon Dec
> > 17 01:20:25 2007
> > @@ -19,33 +19,31 @@
> > -->
> >
> > <assembly>
> > - <id>lib-backport</id>
> > + <id>lib-jdk14</id>
> > <formats>
> > <format>zip</format>
> > </formats>
> > <dependencySets>
> > - <dependencySet>
> > - <outputDirectory>backport</outputDirectory>
> > + <dependencySet useTransitiveFiltering="true">
> > + <outputDirectory>jdk14</outputDirectory>
> >
> > <outputFileNameMapping>${artifactId}-${version}.${extension}</outputFileNameMapping>
> > - <includes>
> > - <include>net.sf.retrotranslator:retrotranslator-runtime</include>
> >
> > - <include>backport-util-concurrent:backport-util-concurrent</include>
> > - </includes>
> > + <excludes>
> > + <exclude>org.apache.struts:*:jar</exclude>
> > + <exclude>*xwork*</exclude>
> > + </excludes>
> > </dependencySet>
> > - <dependencySet>
> > - <outputDirectory>backport</outputDirectory>
> >
> > - <outputFileNameMapping>${artifactId}-${version}-backport.${extension}</outputFileNameMapping>
> > + <dependencySet useTransitiveFiltering="true">
> > + <outputDirectory>jdk14</outputDirectory>
> >
> > + <outputFileNameMapping>${artifactId}-${version}-jdk14.${extension}</outputFileNameMapping>
> > <includes>
> > - <include>org.apache.struts:struts2-api:jar:backport</include>
> > - <include>org.apache.struts:struts2-core:jar:backport</include>
> > - <include>com.opensymphony:xwork:jar:backport</include>
> > + <include>*:jdk14</include>
> > </includes>
> > </dependencySet>
> > </dependencySets>
> > <fileSets>
> > <fileSet>
> > - <directory>../backport</directory>
> > - <outputDirectory>backport</outputDirectory>
> > + <directory>../jdk14</directory>
> > + <outputDirectory>jdk14</outputDirectory>
> > <includes>
> > <include>README*</include>
> > <include>*LICENSE*</include>
> >
> > Modified: struts/struts2/trunk/assembly/src/main/assembly/lib.xml
> > URL:
> > http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/lib.xml?rev=604801&r1=604800&r2=604801&view=diff
> >
> > ==============================================================================
> > --- struts/struts2/trunk/assembly/src/main/assembly/lib.xml (original)
> > +++ struts/struts2/trunk/assembly/src/main/assembly/lib.xml Mon Dec 17
> > 01:20:25 2007
> > @@ -28,8 +28,7 @@
> > <outputDirectory>lib</outputDirectory>
> > <scope>runtime</scope>
> > <excludes>
> > - <exclude>net.sf.retrotranslator:retrotranslator-runtime</exclude>
> > - <exclude>*:backport</exclude>
> > + <exclude>*:jdk14</exclude>
> > </excludes>
> > </dependencySet>
> > </dependencySets>
> >
> >
> >
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org