Author: wsmoak
Date: Thu Oct 20 22:52:55 2005
New Revision: 327102
URL: http://svn.apache.org/viewcvs?rev=327102&view=rev
Log:
Decoupled BSF from the common Maven build.
Fixed version number. Added dependencies, reports, and developer list.
Fixed website navigation.
Added missing svn props.
Added:
struts/bsf/trunk/maven.xml (with props)
struts/bsf/trunk/project.properties (with props)
Modified:
struts/bsf/trunk/project.xml (contents, props changed)
struts/bsf/trunk/xdocs/navigation.xml (contents, props changed)
Added: struts/bsf/trunk/maven.xml
URL:
http://svn.apache.org/viewcvs/struts/bsf/trunk/maven.xml?rev=327102&view=auto
==============================================================================
--- struts/bsf/trunk/maven.xml (added)
+++ struts/bsf/trunk/maven.xml Thu Oct 20 22:52:55 2005
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+
+<project default="dist"
+ xmlns:j="jelly:core"
+ xmlns:ant="jelly:ant"
+ xmlns:maven="jelly:maven">
+
+ <postGoal name="dist">
+ <attainGoal name="jar:install"/>
+ </postGoal>
+
+ <postGoal name="dist:prepare-bin-filesystem">
+
+ <ant:copy todir="${maven.dist.bin.assembly.dir}">
+ <ant:fileset dir="${basedir}">
+ <ant:include name="NOTICE*"/>
+ </ant:fileset>
+ </ant:copy>
+
+ <ant:ant dir="${basedir}" antfile="build.xml" target="example" />
+
+ <ant:copy file="dist/struts-example.war"
+ todir="${maven.dist.bin.assembly.dir}" />
+
+ </postGoal>
+
+ <postGoal name="dist:prepare-src-filesystem">
+
+ <ant:copy todir="${maven.dist.src.assembly.dir}">
+ <ant:fileset dir="${basedir}">
+ <ant:include name="NOTICE*"/>
+ </ant:fileset>
+ </ant:copy>
+
+ </postGoal>
+
+</project>
Propchange: struts/bsf/trunk/maven.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/bsf/trunk/maven.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: struts/bsf/trunk/project.properties
URL:
http://svn.apache.org/viewcvs/struts/bsf/trunk/project.properties?rev=327102&view=auto
==============================================================================
--- struts/bsf/trunk/project.properties (added)
+++ struts/bsf/trunk/project.properties Thu Oct 20 22:52:55 2005
@@ -0,0 +1,9 @@
+
+maven.changelog.factory = org.apache.maven.svnlib.SvnChangeLogFactory
+maven.changelog.range = 120
+
+maven.compile.source=1.4
+maven.compile.target=1.4
+
+maven.repo.remote=http://www.ibiblio.org/maven/,http://cvs.apache.org/repository
+
Propchange: struts/bsf/trunk/project.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: struts/bsf/trunk/project.properties
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: struts/bsf/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/struts/bsf/trunk/project.xml?rev=327102&r1=327101&r2=327102&view=diff
==============================================================================
--- struts/bsf/trunk/project.xml (original)
+++ struts/bsf/trunk/project.xml Thu Oct 20 22:52:55 2005
@@ -18,10 +18,17 @@
*/
-->
- <extend>build/project.xml</extend>
+ <!-- <extend>build/project.xml</extend> -->
+ <organization>
+ <name>The Apache Software Foundation</name>
+ <url>http://www.apache.org/</url>
+ <logo>http://www.apache.org/images/asf-logo.gif</logo>
+ </organization>
+ <logo>http://struts.apache.org/images/struts.gif</logo>
+
<id>struts-bsf</id>
<name>Struts BSF</name>
- <currentVersion>1.0-dev</currentVersion>
+ <currentVersion>0.5-dev</currentVersion>
<inceptionYear>2003</inceptionYear>
<package>org.apache.struts.bsf</package>
@@ -45,13 +52,68 @@
<url>http://svn.apache.org/repos/asf/struts/bsf/trunk</url>
</repository>
-
+ <developers>
+ <developer>
+ <name>Don Brown</name>
+ <id>mrdon</id>
+ <email>mrdon at apache.org</email>
+ <organization></organization>
+ </developer>
+ </developers>
+
<dependencies>
-
+
+ <dependency>
+ <groupId>servletapi</groupId>
+ <artifactId>servletapi</artifactId>
+ <version>2.3</version>
+ <url>http://java.sun.com/products/servlet/</url>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ <url>http://jakarta.apache.org/commons/beanutils/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ <url>http://jakarta.apache.org/commons/logging/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.7</version>
+ <url>http://jakarta.apache.org/commons/digester/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <version>1.1.4</version>
+ <url>http://jakarta.apache.org/commons/validator/</url>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
<dependency>
<groupId>struts</groupId>
- <artifactId>struts-core</artifactId>
- <version>1.3.0-dev</version>
+ <artifactId>struts</artifactId>
+ <version>1.2.7</version>
<url>http://struts.apache.org/</url>
<properties>
<war.bundle>true</war.bundle>
@@ -97,12 +159,35 @@
</dependencies>
<build>
- <!-- bsf specific build stuff here -->
+ <nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
+ <sourceDirectory>src/java</sourceDirectory>
+ <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+
+ <unitTest>
+ <includes>
+ <include>**/Test*.java</include>
+ </includes>
+ </unitTest>
</build>
<reports>
- <!-- bsf specific reports stuff here -->
-
+ <report>maven-checkstyle-plugin</report>
+ <report>maven-changelog-plugin</report>
+ <report>maven-changes-plugin</report>
+ <report>maven-developer-activity-plugin</report>
+ <report>maven-faq-plugin</report>
+ <report>maven-file-activity-plugin</report>
+ <report>maven-javadoc-plugin</report>
+ <report>maven-jdepend-plugin</report>
+ <report>maven-junit-report-plugin</report>
+ <report>maven-jxr-plugin</report>
+ <!--report>maven-linkcheck-plugin</report-->
+ <report>maven-pmd-plugin</report>
+ <report>maven-simian-plugin</report>
+ <report>maven-tasklist-plugin</report>
+ <report>maven-jcoverage-plugin</report>
+ <!--report>maven-findbugs-plugin</report-->
</reports>
+
</project>
Propchange: struts/bsf/trunk/project.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: struts/bsf/trunk/xdocs/navigation.xml
URL:
http://svn.apache.org/viewcvs/struts/bsf/trunk/xdocs/navigation.xml?rev=327102&r1=327101&r2=327102&view=diff
==============================================================================
--- struts/bsf/trunk/xdocs/navigation.xml (original)
+++ struts/bsf/trunk/xdocs/navigation.xml Thu Oct 20 22:52:55 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project name="Struts Framework"
- href="http://struts.apache.org/bsf";
+ href="http://struts.apache.org";
image="images/struts.gif">
<title>Struts BSF Scripting - Apache Struts Framework</title>
@@ -16,12 +16,6 @@
<item
name="Struts"
href="../index.html"/>
- <item
- name="User and Developer Guides *"
- href="../struts-core/userGuide/index.html"/>
- <item
- name="FAQs and HowTos"
- href="../struts-core/faqs/index.html"/>
</menu>
</body>
Propchange: struts/bsf/trunk/xdocs/navigation.xml
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
