Author: jmitchell
Date: Tue Aug 30 18:30:30 2005
New Revision: 264912
URL: http://svn.apache.org/viewcvs?rev=264912&view=rev
Log:
share -> core
Added:
struts/core/trunk/conf/java/
- copied from r264907, struts/core/trunk/conf/share/
struts/core/trunk/src/java/
- copied from r264907, struts/core/trunk/src/share/
Removed:
struts/core/trunk/conf/share/
struts/core/trunk/src/share/
Modified:
struts/core/trunk/build.legacy.xml
struts/core/trunk/build.xml
struts/core/trunk/conf/java/struts-config_1_0.dtd
struts/core/trunk/conf/java/struts-config_1_1.dtd
struts/core/trunk/conf/java/tiles-config_1_1.dtd
struts/core/trunk/maven.xml
struts/core/trunk/project.xml
Modified: struts/core/trunk/build.legacy.xml
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/build.legacy.xml?rev=264912&r1=264911&r2=264912&view=diff
==============================================================================
--- struts/core/trunk/build.legacy.xml (original)
+++ struts/core/trunk/build.legacy.xml Tue Aug 30 18:30:30 2005
@@ -165,13 +165,13 @@
<property name="src.dir" value="src"/>
<!-- Source directory for core struts library -->
- <property name="src.share.dir" value="${src.dir}/share"/>
+ <property name="src.java.dir" value="${src.dir}/java"/>
<!-- Source directory for non-Cactus unit tests -->
<property name="src.test.dir" value="${src.dir}/test"/>
<!-- Directory where core struts library configurations files are stored
-->
- <property name="conf.share.dir" value="conf/share"/>
+ <property name="conf.java.dir" value="conf/java"/>
<!-- Directory where test configurations files are stored -->
<property name="conf.test.dir" value="conf/test"/>
@@ -257,10 +257,10 @@
tofile="${build.home}/library/classes/META-INF/LICENSE"/>
<copy file="build/NOTICE.txt"
tofile="${build.home}/library/classes/META-INF/NOTICE"/>
- <copy file="${conf.share.dir}/chain-config.xml"
+ <copy file="${conf.java.dir}/chain-config.xml"
tofile="${build.home}/library/classes/org/apache/struts/chain/chain-config.xml"
/>
<copy
todir="${build.home}/library/classes/org/apache/struts/resources">
- <fileset dir="${conf.share.dir}" includes="**/*.dtd"/>
+ <fileset dir="${conf.java.dir}" includes="**/*.dtd"/>
</copy>
<copy file="${commons-beanutils.jar}"
tofile="${build.home}/library/commons-beanutils.jar"/>
@@ -290,7 +290,7 @@
-->
<target name="compile.library" depends="prepare.library"
description="Compile Struts library files">
- <javac srcdir="${src.share.dir}"
+ <javac srcdir="${src.java.dir}"
destdir="${build.home}/library/classes"
debug="${compile.debug}"
optimize="${compile.optimize}"
@@ -298,12 +298,12 @@
<classpath refid="compile.classpath"/>
</javac>
<copy todir="${build.home}/library/classes">
- <fileset dir="${src.share.dir}" includes="**/*.properties"/>
+ <fileset dir="${src.java.dir}" includes="**/*.properties"/>
</copy>
<copy todir="${build.home}/library">
- <fileset dir="${conf.share.dir}" includes="*.dtd"/>
- <fileset dir="${conf.share.dir}" includes="*.tld"/>
- <fileset dir="${conf.share.dir}" includes="*.xml"/>
+ <fileset dir="${conf.java.dir}" includes="*.dtd"/>
+ <fileset dir="${conf.java.dir}" includes="*.tld"/>
+ <fileset dir="${conf.java.dir}" includes="*.xml"/>
</copy>
<style basedir="${doc.dir}/userGuide"
destdir="${build.home}/library"
@@ -323,7 +323,7 @@
value="http://jakarta.apache.org/struts/tags"/>
</replace>
<jar jarfile="${build.home}/library/${app.name}.jar"
- manifest="${conf.share.dir}/MANIFEST.MF"
+ manifest="${conf.java.dir}/MANIFEST.MF"
basedir="${build.home}/library/classes"
includes="**"/>
</target>
@@ -335,7 +335,7 @@
description="Generate JavaDoc API docs">
<delete dir="${build.home}/documentation/api"/>
<mkdir dir="${build.home}/documentation/api"/>
- <javadoc sourcepath="${src.share.dir}"
+ <javadoc sourcepath="${src.java.dir}"
destdir="${build.home}/documentation/api"
classpath="${servlet.jar}:${jsp.jar}:${jdbc20ext.jar}"
packagenames="org.apache.struts.*"
@@ -525,7 +525,7 @@
</taskdef>
<checkstyle>
<formatter type="plain"/>
- <fileset dir="${src.share.dir}" includes="**/*.java"/>
+ <fileset dir="${src.java.dir}" includes="**/*.java"/>
</checkstyle>
</target>
@@ -537,7 +537,7 @@
</taskdef>
<pmd printToConsole="true" rulesetfiles="${pmd.rulesets}"
shortFilenames="true">
<formatter type="html" toFile="${pmd.report}" />
- <fileset dir="${src.share.dir}" includes="**/*.java"/>
+ <fileset dir="${src.java.dir}" includes="**/*.java"/>
</pmd>
</target>
@@ -555,7 +555,7 @@
<auxClasspath>
<path refid="compile.classpath"/>
</auxClasspath>
- <sourcePath path="${src.share.dir}"/>
+ <sourcePath path="${src.java.dir}"/>
</findbugs>
</target>
Modified: struts/core/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/build.xml?rev=264912&r1=264911&r2=264912&view=diff
==============================================================================
--- struts/core/trunk/build.xml (original)
+++ struts/core/trunk/build.xml Tue Aug 30 18:30:30 2005
@@ -45,14 +45,14 @@
</mkdir>
<javac destdir="${classesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
<src>
- <pathelement location="src/share">
+ <pathelement location="src/java">
</pathelement>
</src>
<classpath refid="build.classpath">
</classpath>
</javac>
<copy todir="${classesdir}">
- <fileset dir="src/share">
+ <fileset dir="src/java">
<include name="**/*.properties">
</include>
</fileset>
@@ -60,7 +60,7 @@
<mkdir dir="${classesdir}/org/apache/struts/resources">
</mkdir>
<copy todir="${classesdir}/org/apache/struts/resources">
- <fileset dir="conf/share">
+ <fileset dir="conf/java">
<include name="**/*.dtd">
</include>
</fileset>
@@ -68,7 +68,7 @@
<mkdir dir="${classesdir}/org/apache/struts/chain">
</mkdir>
<copy todir="${classesdir}/org/apache/struts/chain">
- <fileset dir="conf/share">
+ <fileset dir="conf/java">
<include name="chain-config.xml">
</include>
</fileset>
@@ -172,7 +172,7 @@
</property>
<property name="title" value="Struts Core 1.3.0-dev API">
</property>
- <javadoc use="true" private="true" destdir="${javadocdir}" author="true"
version="true" sourcepath="src/share" packagenames="org.apache.struts.*">
+ <javadoc use="true" private="true" destdir="${javadocdir}" author="true"
version="true" sourcepath="src/java" packagenames="org.apache.struts.*">
<classpath>
<path refid="build.classpath">
</path>
Modified: struts/core/trunk/conf/java/struts-config_1_0.dtd
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/conf/java/struts-config_1_0.dtd?rev=264912&r1=264907&r2=264912&view=diff
==============================================================================
--- struts/core/trunk/conf/java/struts-config_1_0.dtd (original)
+++ struts/core/trunk/conf/java/struts-config_1_0.dtd Tue Aug 30 18:30:30 2005
@@ -11,7 +11,7 @@
"-//Apache Software Foundation//DTD Struts Configuration 1.0//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_0.dtd";>
- $Id: struts-config_1_0.dtd,v 1.5 2001/06/02 18:20:47 craigmcc Exp $
+ $Id$
-->
Modified: struts/core/trunk/conf/java/struts-config_1_1.dtd
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/conf/java/struts-config_1_1.dtd?rev=264912&r1=264907&r2=264912&view=diff
==============================================================================
--- struts/core/trunk/conf/java/struts-config_1_1.dtd (original)
+++ struts/core/trunk/conf/java/struts-config_1_1.dtd Tue Aug 30 18:30:30 2005
@@ -8,7 +8,7 @@
"-//Apache Software Foundation//DTD Struts Configuration 1.1//EN"
"http://jakarta.apache.org/struts/dtds/struts-config_1_1.dtd";>
- $Id: struts-config_1_1.dtd,v 1.42 2004/02/17 05:51:47 martinc Exp $
+ $Id$
-->
Modified: struts/core/trunk/conf/java/tiles-config_1_1.dtd
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/conf/java/tiles-config_1_1.dtd?rev=264912&r1=264907&r2=264912&view=diff
==============================================================================
--- struts/core/trunk/conf/java/tiles-config_1_1.dtd (original)
+++ struts/core/trunk/conf/java/tiles-config_1_1.dtd Tue Aug 30 18:30:30 2005
@@ -8,7 +8,7 @@
"-//Apache Software Foundation//DTD Tiles Configuration 1.1//EN"
"http://struts.apache.org/dtds/tiles-config_1_1.dtd";>
- $Id: tiles-config_1_1.dtd,v 1.8 2004/09/01 10:41:11 niallp Exp $
+ $Id$
-->
Modified: struts/core/trunk/maven.xml
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/maven.xml?rev=264912&r1=264911&r2=264912&view=diff
==============================================================================
--- struts/core/trunk/maven.xml (original)
+++ struts/core/trunk/maven.xml Tue Aug 30 18:30:30 2005
@@ -10,7 +10,7 @@
<!-- Copy configuration files -->
<j:set var="docsDest" value="${maven.docs.dest}"/>
<ant:copy todir="${maven.dist.bin.assembly.dir}/conf">
- <ant:fileset dir="./conf/share">
+ <ant:fileset dir="./conf/java">
<ant:include name="*.xml"/>
<ant:include name="*.dtd"/>
</ant:fileset>
@@ -22,8 +22,8 @@
<!-- Copy configuration files -->
<j:set var="docsDest" value="${maven.docs.dest}"/>
- <ant:copy todir="${maven.dist.src.assembly.dir}/conf/share">
- <ant:fileset dir="./conf/share">
+ <ant:copy todir="${maven.dist.src.assembly.dir}/conf/java">
+ <ant:fileset dir="./conf/java">
<ant:include name="*.xml"/>
<ant:include name="*.dtd"/>
</ant:fileset>
Modified: struts/core/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/struts/core/trunk/project.xml?rev=264912&r1=264911&r2=264912&view=diff
==============================================================================
--- struts/core/trunk/project.xml (original)
+++ struts/core/trunk/project.xml Tue Aug 30 18:30:30 2005
@@ -117,7 +117,7 @@
</dependencies>
<build>
- <sourceDirectory>src/share</sourceDirectory>
+ <sourceDirectory>src/java</sourceDirectory>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<unitTest>
<includes>
@@ -125,7 +125,7 @@
</includes>
<resources>
<resource>
- <directory>conf/share</directory>
+ <directory>conf/java</directory>
<targetPath>org/apache/struts/resources</targetPath>
<includes>
<include>**/*.xml</include>
@@ -142,20 +142,20 @@
</unitTest>
<resources>
<resource>
- <directory>src/share</directory>
+ <directory>src/java</directory>
<includes>
<include>**/*.properties</include>
</includes>
</resource>
<resource>
- <directory>conf/share</directory>
+ <directory>conf/java</directory>
<targetPath>org/apache/struts/resources</targetPath>
<includes>
<include>**/*.dtd</include>
</includes>
</resource>
<resource>
- <directory>conf/share</directory>
+ <directory>conf/java</directory>
<targetPath>org/apache/struts/chain</targetPath>
<includes>
<include>chain-config.xml</include>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
