Revision: 507
http://svn.sourceforge.net/stripes/?rev=507&view=rev
Author: tfenne
Date: 2007-04-01 13:51:03 -0700 (Sun, 01 Apr 2007)
Log Message:
-----------
Merge of fix for STS-352 on to the 1.4.x branch
Modified Paths:
--------------
branches/1.4.x/build.properties
branches/1.4.x/build.xml
Added Paths:
-----------
branches/1.4.x/stripes/pom.xml
Modified: branches/1.4.x/build.properties
===================================================================
--- branches/1.4.x/build.properties 2007-04-01 20:45:03 UTC (rev 506)
+++ branches/1.4.x/build.properties 2007-04-01 20:51:03 UTC (rev 507)
@@ -2,7 +2,7 @@
## Properties file used during the Stripes build process.
## Author: Tim Fennell
###############################################################################
-stripes.version=1.4.2
+stripes.version=1.4.3
tomcat.username=operator
tomcat.password=tank
Modified: branches/1.4.x/build.xml
===================================================================
--- branches/1.4.x/build.xml 2007-04-01 20:45:03 UTC (rev 506)
+++ branches/1.4.x/build.xml 2007-04-01 20:51:03 UTC (rev 507)
@@ -34,6 +34,7 @@
<property name="zip.file" value="${zip.prefix}.zip"/>
<property name="zip.src.prefix" value="stripes-${stripes.version}-src"/>
<property name="zip.src.file" value="${zip.src.prefix}.zip"/>
+ <property name="mvn.bundle.file"
value="stripes-${stripes.version}-bundle.jar"/>
<!-- ===================================================================
-->
<!-- Builds Stripes, then copies dependencies over into the examples.
-->
@@ -145,6 +146,24 @@
<include name="tests/build.xml"/>
</zipfileset>
</zip>
+
+ <!-- make the maven2 bundle -->
+ <filter token="stripes.version" value="${stripes.version}"/>
+ <copy file="${stripes.dir}/pom.xml" todir="dist/"
filtering="true"/>
+ <copy file="${stripes.dir}/dist/stripes.jar"
tofile="dist/stripes-${stripes.version}.jar"/>
+ <jar destfile="dist/stripes-${stripes.version}-sources.jar">
+ <zipfileset dir="stripes/src" prefix="."/>
+ <zipfileset dir="stripes/resources" prefix="."/>
+ </jar>
+ <jar destfile="dist/${mvn.bundle.file}">
+ <zipfileset file="dist/pom.xml" prefix="."/>
+ <zipfileset
file="dist/stripes-${stripes.version}-sources.jar" prefix="."/>
+ <zipfileset dir="dist"
includes="stripes-${stripes.version}.jar" prefix="."/>
+ </jar>
+
+ <delete file="dist/stripes-${stripes.version}-sources.jar"
quiet="true"/>
+ <delete file="dist/stripes-${stripes.version}.jar"
quiet="true"/>
+ <delete file="dist/pom.xml" quiet="true"/>
</target>
<!-- ===================================================================
-->
@@ -154,4 +173,4 @@
description="Redploys the example application to a Tomcat server
defined in build.properties">
<ant dir="examples" target="redeploy"/>
</target>
-</project>
\ No newline at end of file
+</project>
Added: branches/1.4.x/stripes/pom.xml
===================================================================
--- branches/1.4.x/stripes/pom.xml (rev 0)
+++ branches/1.4.x/stripes/pom.xml 2007-04-01 20:51:03 UTC (rev 507)
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This pom.xml is intended to be included with the stripes-x-bundle.jar that
+ ++ is uploaded to the maven2 repository at iBiblio. It is not a complete
+ ++ build environment for Stripes. If you intent to build Stripes locally
+ ++ please use the ant build scripts provided (they're dead simple).
+ -->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>net.sourceforge.stripes</groupId>
+ <artifactId>stripes</artifactId>
+ <version>@stripes.version@</version>
+ <packaging>jar</packaging>
+ <name>Stripes</name>
+ <url>http://stripes.mc4j.org/</url>
+ <description>Stripes web framework jar, including tag
library.</description>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <scm>
+ <url>https://svn.sourceforge.net/svnroot/stripes</url>
+ </scm>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://mc4j.org/jira/browse/STS</url>
+ </issueManagement>
+ <dependencies>
+ <dependency>
+ <groupId>servlets.com</groupId>
+ <artifactId>cos</artifactId>
+ <version>05Nov2002</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.3.3_01</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.9</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.02</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- Spring is needed to compile the Spring support in Stripes, and
from then on, only if
+ you are actually using Spring in your own application.
+ -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ <version>1.2.6</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+
+ <!-- Commons fileupload and io are listed as optional dependencies for
Stripes beceause
+ they are needed to compile and use the commons version of the
MultipartWrapper.
+ However, the default implementation uses COS instead, so these
jars are only
+ necessary if you plan to use the commons version, or which to
compiles Stripes
+ from source.
+ -->
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.1.1</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.2</version>
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+</project>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
