Author: ronvoe122
Date: 2007-12-05 09:48:36-0800
New Revision: 10492
Modified:
trunk/build/build.xml
trunk/maven.xml
trunk/xdocs/howto/build-docs-howto.xml
trunk/xdocs/maven_goals.xml
Log:
Removed some obsolete code in the build scripts and the according docs.
Modified: trunk/build/build.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/build/build.xml?view=diff&rev=10492&p1=trunk/build/build.xml&p2=trunk/build/build.xml&r1=10491&r2=10492
==============================================================================
--- trunk/build/build.xml (original)
+++ trunk/build/build.xml 2007-12-05 09:48:36-0800
@@ -2,12 +2,12 @@
<!-- ===================================================================== -->
<!-- -->
-<!-- Build file for Scarab -->
+<!-- Build file for Scarab -->
<!-- ===================== -->
<!-- -->
<!-- Quickstep docu: -->
<!-- ant deploy generate om, compile, create a functional webapp in -->
-<!-- scarab/target/scarab -->
+<!-- target/scarab -->
<!-- -->
<!-- subordinate tasks (usefull for developers only) -->
<!-- ant compile generate om and compile. Place results into -->
@@ -24,17 +24,9 @@
-->
<property name="configuration.file" value="build.properties"/>
- <!-- Give user a chance to override without editing this file
- (and without using -D arguments each time they build)
- Allow a build.properties in the project root in the
- same place it would be used by Maven.
- -->
<property name="root.dir" value=".."/>
- <property name="antbase.dir" value="."/>
<property file="${root.dir}/wizzard.properties"/>
- <property file="${user.home}/scarab.${configuration.file}" />
- <property file="${user.home}/${configuration.file}" />
<property file="${root.dir}/${configuration.file}"/>
<property file="${root.dir}/project.properties" />
@@ -111,11 +103,6 @@
<echo>lib.dir is [${lib.dir}]</echo>
<echo>repository is [${repository.dir}]</echo>
<copy todir="${build.project.webinf}/lib" filtering="no" flatten="true">
- <fileset dir="${lib.dir}/">
- <exclude name="**/servlet*.jar"/>
- <exclude name="**/xalan*.jar"/>
- <include name="**/*.jar"/>
- </fileset>
<fileset dir="${repository.dir}">
<exclude name="**/servlet*.jar"/>
<exclude name="**/xalan*.jar"/>
Modified: trunk/maven.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/maven.xml?view=diff&rev=10492&p1=trunk/maven.xml&p2=trunk/maven.xml&r1=10491&r2=10492
==============================================================================
--- trunk/maven.xml (original)
+++ trunk/maven.xml 2007-12-05 09:48:36-0800
@@ -6,14 +6,6 @@
xmlns:bsh="jelly:beanshell"
xmlns:maven="jelly:maven">
- <!--
- The ordering of goals in this file should be:
- scarab:*
- preGoals
- postGoals
- deprecated scarab:*
- -->
-
<maven:property name="root.dir" defaultValue="${basedir}"/>
<maven:property name="applicationRoot" defaultValue="${root.dir}/target/scarab"/>
<maven:property name="maven.changes.issue.template" defaultValue="%URL%/issues?id=%ISSUE%"/>
@@ -96,41 +88,6 @@
tofile="target/dist/tomcat/webapps/scarab.xml"/>
</goal>
- <goal name="scarab:deploy_docs_head" prereqs="site"
- description="Copy documentation to scarab-gen head">
- <ant:echo message="Copying Site Documentation to ${scarab.docs.head}"/>
- <!--
- Blank out the obvious stuff that causes CVS mismatch errors. Like the $Id string that
- is replaced by CVS on checkin, or the Javadoc timestamp.
- -->
- <j:set var="dollar.str" value="$"/>
- <j:set var="regExpression" value="\${dollar.str}Id:[^\${dollar.str}]*"/>
- <ant:echo message="regexp:${regExpression}" />
- <ant:replaceregexp match="\bGenerated by javadoc[^-]*"
- replace="BLANKED" byline="true">
- <ant:fileset dir="${maven.docs.dest}/apidocs" includes="**/*.html"
- />
- </ant:replaceregexp>
-<!-- <ant:replaceregexp match="${regExpression}" replace="BLANKED"
- byline="true">
- <ant:fileset dir="${maven.docs.dest}\jcoverage"
- includes="**/*.html" />
- </ant:replaceregexp> -->
- <ant:replaceregexp match="${regExpression}" replace="BLANKED"
- byline="true">
- <ant:fileset dir="${maven.docs.dest}\xref" includes="**/*.html" />
- </ant:replaceregexp>
- <ant:replaceregexp match="${regExpression}" replace="BLANKED"
- byline="true">
- <ant:fileset dir="${maven.docs.dest}\xref-test"
- includes="**/*.html" />
- </ant:replaceregexp>
- <ant:copy todir="${scarab.docs.head}">
- <ant:fileset dir="${maven.docs.dest}" includes="**/*.*">
- </ant:fileset>
- </ant:copy>
- </goal>
-
<!-- ======================================================== -->
<!-- P R O P E R T Y - M A I N T E N A N C E -->
<!-- ======================================================== -->
@@ -148,8 +105,7 @@
<!-- Maven scarab:update-properties -->
<!-- -->
<!-- FIXME This goal is broken under java 1.5 -->
- <!-- ======================================================== -->
-
+ <!-- ======================================================== -->
<goal
name="scarab:update-properties"
description="update the scarab project.properties">
@@ -178,10 +134,6 @@
</ant:style>
</goal>
-
- <!-- ===================================================== -->
- <!-- END P R O P E R T Y - M A I N T E N A N C E -->
- <!-- ===================================================== -->
<!-- ===================================================== -->
<!-- R E P O S I T O R Y - M A I N T E N A N C E -->
@@ -198,7 +150,6 @@
<!-- -->
<!-- Maven scarab:update-repo -->
<!-- ===================================================== -->
-
<goal
name="scarab:update-repo"
description="update the Scarab www/repository">
@@ -267,9 +218,6 @@
</j:forEach>
</goal>
- <!-- ===================================================== -->
- <!-- END R E P O S I T O R Y - M A I N T E N A N C E -->
- <!-- ===================================================== -->
<goal name="scarab:inplace-clean" prereqs="war:load">
<j:set var="warWebappBuildDir" value="${maven.war.src}"/>
@@ -292,39 +240,6 @@
<attainGoal name="clean"/>
</goal>
- <goal name="scarab:fix_linefeeds">
- <ant:fixcrlf srcDir="${maven.src.dir}" eol="lf" eof="remove"
- includes="**/*.java" />
- </goal>
-
-
- <goal name="scarab:fix_hsql_schema">
- <bsh:script>
- // fix the illegal column widths from torque-3.1.1 for hsqldb 1.7.2+
- System.out.println("Fixing hsqldb schema.");
- try {
- java.io.BufferedReader rdr = new java.io.BufferedReader(new java.io.FileReader("target/sql/scarab-schema.sql"));
- java.io.BufferedWriter wrtr = new java.io.BufferedWriter(new java.io.FileWriter("target/sql/scarab-schema-filtered.sql"));
-
- while ((str = rdr.readLine()) != null) {
- String fstr = str.replaceAll("integer \\(\\d+\\)", "integer");
- fstr = fstr.replaceAll("DELETED\\s+integer[^,]*,", "DELETED integer DEFAULT 0,");
-
- wrtr.write(fstr);
- wrtr.newLine();
- }
- rdr.close();
- wrtr.close();
- } catch (java.io.IOException e) {
- e.printStackTrace();
- }
- </bsh:script>
- <ant:delete file="target/sql/scarab-schema.sql"/>
- <ant:copy file="target/sql/scarab-schema-filtered.sql"
- tofile="target/sql/scarab-schema.sql"/>
- <ant:delete file="target/sql/scarab-schema-filtered.sql"/>
- </goal>
-
<preGoal name="war:war">
<ant:ant antfile="build.xml"
target="create-deployment-directory"
@@ -494,26 +409,7 @@
toFile="${genDocs}/scarab_properties_final.xml" overwrite="true"/>
</postGoal>
-
- <!-- Deprecated goal -->
- <goal name="scarab:inplace">
- <echo>
- =====================================================
- Notice !
- scarab:inplace goal is deprecated.
- It will be removed.
- Please use war:inplace goal instead.
- Thanks.
-
- Scarab Team - 2004.11.2
- =====================================================
-
- ** Please hit Enter to continue scarab build process.. **
- </echo>
- <i:ask prompt="Please hit Enter to continue scarab build process.." />
- <attainGoal name="war:inplace"/>
- </goal>
-
+
<!-- ===================================================== -->
<!-- R E S S O U R C E - F I L E M A I N T E N A N C E -->
<!-- ===================================================== -->
@@ -587,9 +483,6 @@
<!-- same for InitDb bundles -->
</goal>
- <!-- ===================================================== -->
- <!-- END R E S S O U R C E - M A I N T E N A N C E -->
- <!-- ===================================================== -->
<!-- ===================================================== -->
<!-- DEBIAN PACKAGE CREATION FOR A SCARAB INSTANCE -->
@@ -651,8 +544,5 @@
<arg line="-b ${debian.package.dir} ${debian.package.dir}-${DSTAMP}${TSTAMP}.deb"/>
</ant:exec>
</goal>
- <!-- ===================================================== -->
- <!-- END OF DEBIAN PACKAGE CREATION FOR A SCARAB INSTANCE -->
- <!-- ===================================================== -->
</project>
Modified: trunk/xdocs/howto/build-docs-howto.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/xdocs/howto/build-docs-howto.xml?view=diff&rev=10492&p1=trunk/xdocs/howto/build-docs-howto.xml&p2=trunk/xdocs/howto/build-docs-howto.xml&r1=10491&r2=10492
==============================================================================
--- trunk/xdocs/howto/build-docs-howto.xml (original)
+++ trunk/xdocs/howto/build-docs-howto.xml 2007-12-05 09:48:36-0800
@@ -15,9 +15,6 @@
generated by <a href="http://maven.apache.org">Maven</a>. If you haven't used Maven before,
follow the <a href="http://maven.apache.org/start/index.html">Getting Started</a> directions.
</p>
-<p>
- The documentation is published by committing it to CVS in a seperate project called "scarab-gen".
-</p>
<subsection name="Generating Maven Managed Docs">
<p>
@@ -43,42 +40,5 @@
CVS.exe in the TortoiseCVS directory works fine.
</p>
</subsection>
-
- <subsection name="Committing Maven Managed Docs">
- <p>
- By default, Scarab is set up to ignore any files in the /target directory. So, to commit updated documentation, instead
- we use another project called "Scarab-Gen". This allows us to only have to deal with committing update documentation when
- we are actively working with the documents, and allows most developers to not have to check out from CVS multiple megabytes of
- documentation that they can either browse online, or generate for themselves.
- </p>
- <p>
- First check out the "scarab-gen" project from CVS. This project has all the same permissions etc as the main Scarab project
- itself. By default, Scarab expects the scarab-gen and scarab projects to be at the same level in the directory structure. For
- example on Windows:
- <source>
- c:\java\scarab
- c:\java\scarab-gen
- </source>
- If not, update the scarab.docs.home property in project.properties.
- </p>
- <p>
- If you are updating the HEAD version of the documentation, run then run Maven:
- <source>
- maven scarab:deploy_docs_head
- </source>
- to copy $SCARAB_HOME/target/docs/ to $SCARAB_GEN_HOME/www/head/. This also blanks out some of the commonly changed data so
- that when you commit to CVS you don't have to update every single file just because the Javadoc timestamp changed.
- </p>
- <p>
- If you are cutting a release, then having timestamps etc is okay. Instead generate the documentation, then copy the documentation from $SCARAB_HOME/target/docs/
- to $SCARAB_GEN_HOME/www/{betarelease}/. So, for beta19, you would copy to $SCARAB_GEN_HOME/www/b19/.
- </p>
- <p>
- When you commit your new code you may need to do it in chunks. CVS can timeout if you attempt to commit everything all at once
- as the documentation is quite large.
- </p>
- </subsection>
-</section>
-
</body>
</document>
Modified: trunk/xdocs/maven_goals.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/xdocs/maven_goals.xml?view=diff&rev=10492&p1=trunk/xdocs/maven_goals.xml&p2=trunk/xdocs/maven_goals.xml&r1=10491&r2=10492
==============================================================================
--- trunk/xdocs/maven_goals.xml (original)
+++ trunk/xdocs/maven_goals.xml 2007-12-05 09:48:36-0800
@@ -18,7 +18,7 @@
</td>
</tr>
<tr>
- <td>scarab:clean</td>
+ <td>clean</td>
<td>
Does an extensive clean of directories. Cleans out any work files generated by Tomcat in /tomcat, deletes /src/webapp/WEB-INF/classes and /src/webapp/WEB-INF/conf, and otherwise returns the source tree to normal.
</td>
@@ -29,18 +29,6 @@
Produces a Windows .exe installable version of Scarab with an embedded Tomcat and Hypersonic Database. This is meant as a quick resource for people to use to get started with Scarab. Compiles everything to /target/dist. Requires that you have <a href="http://nsis.sf.net">NSIS</a> installed.
</td>
</tr>
- <tr>
- <td>scarab:deploy_docs_head</td>
- <td>
- Runs "maven site" and then copies all the resulting files to ${scarab.docs.head}. It does some regular expression replacing on dates in the documentation to reduce the number of changes that need to be committed into Scarab Gen. Theorectically running this goal twice means the second time you won't have to commit any changes!
- </td>
- </tr>
- <tr>
- <td>scarab:fix_linefeeds</td>
- <td>
- Changes all CRLF's in the source to just LF, and removes any DOS eof characters.
- </td>
- </tr>
</table>
</section>
</body>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.