Scarab commit: svn commit: r11175 - branches/20120417_mavenPort
[email protected] Tue, 17 Apr 2012 03:57:40 -0700 (PDT)
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: mcoss
Date: 2012-04-17 03:57:40-0700
New Revision: 11175
Modified:
branches/20120417_mavenPort/project.properties
branches/20120417_mavenPort/scarab_properties.xml
Log:
DEL - Removed obsolete ant build related properties.
Modified: branches/20120417_mavenPort/project.properties
Url: http://scarab.tigris.org/source/browse/scarab/branches/20120417_mavenPort/project.properties?view=diff&pathrev=11175&r1=11174&r2=11175
==============================================================================
--- branches/20120417_mavenPort/project.properties (original)
+++ branches/20120417_mavenPort/project.properties 2012-04-17 03:57:40-0700
@@ -1757,69 +1757,6 @@
#######################################################################
-# Section: DEPLOY (For Source distribution only)
-########################################################################
-# This section defines some properties, which affect, how the
-# webapplication is deployed.
-#
-# Relation to ant build:
-# ----------------------
-#
-# deploy
-#
-# NOTE: These properties are only needed in the Source distribution
-# and have no effect in the Runtime distribution.
-#
-#######################################################################
-
-# ----------------------
-# custom.properties.tmpl
-# ----------------------
-#
-#
-# This property tells the build system, which template it shall
-# use to build the default Runtime properties file.
-# Normally the default setting is what you want.
-#
-
-custom.properties.tmpl=${root.dir}/project.properties
-
-
-# ====================
-# Group: customization
-# ====================
-#
-# default.custom.properties
-# custom.properties
-#
-#
-
-default.custom.properties=WEB-INF/conf/defaultCustom.properties
-custom.properties=WEB-INF/conf/custom.properties
-
-# ==========================
-# End of Group customization
-# ==========================
-
-
-# ================
-# Group: buildtime
-# ================
-#
-# scarab.database.ant.buildfile
-# scarab.database.ant.target
-#
-#
-
-scarab.database.ant.buildfile=WEB-INF/conf/build-database.xml
-scarab.database.ant.target=create-db
-
-# ======================
-# End of Group buildtime
-# ======================
-
-
-#######################################################################
# Section: MIGRATION
########################################################################
# These are some default values that are required for
@@ -2183,313 +2120,4 @@
# ================
# End of Group db2
-# ================
-
-
-#######################################################################
-# Section: ANT
-########################################################################
-# This section contains the ant related properties.
-#
-# Relation to ant build:
-# ----------------------
-# This section directly corresponds to the ant tasks
-#
-# compile
-#
-#
-#######################################################################
-
-# ----
-# Name
-# ----
-#
-#
-# Name of the project ("Scarab" for the standard distribution).
-#
-
-Name=Scarab
-
-# -------
-# version
-# -------
-#
-# Project version.
-
-version=1.0-b23-dev
-
-# -------
-# project
-# -------
-#
-#
-# Name of the project, used for???.
-#
-
-project=scarab
-
-# ----
-# year
-# ----
-#
-# Year, possibly used for copyright message.
-
-year=2000-2004
-
-
-# ================
-# Group: directory
-# ================
-#
-# build.dir
-# build.project
-# build.project.webinf
-# build.project.webinf.lib
-# build.sql.scarab
-# build.src.scarab
-# build.dest.scarab
-# deploy.dir
-# deploy.project
-# scarab.torque.schemas
-# repository.dir
-# lib.dir
-# src.dir
-# extensions.dir
-#
-# Directory structure to which Scarab is built.
-# Everything is relative to build.dir
-#
-
-build.dir=${root.dir}/target
-build.project=${build.dir}/scarab
-build.project.webinf=${build.project}/WEB-INF
-build.project.webinf.lib=${build.project}/WEB-INF/lib
-build.sql.scarab=${build.project.webinf}/sql
-build.src.scarab=${build.project.webinf}/src
-build.dest.scarab=${build.project.webinf}/classes
-deploy.dir=${build.dir}
-deploy.project=${deploy.dir}/scarab
-
-# ---------------------
-# scarab.torque.schemas
-# ---------------------
-#
-#
-# The list of Torque-format schemas used by Scarab.
-# This is useful for performing an up-to-date check
-# on generated Java code.
-#
-
-scarab.torque.schemas=scarab-schema.xml
-repository.dir=${root.dir}/www/repository
-lib.dir=${root.dir}/lib
-src.dir=${root.dir}/src
-extensions.dir=${root.dir}/extensions
-
-# ======================
-# End of Group directory
-# ======================
-
-
-#######################################################################
-# Section: MAVEN
-########################################################################
-
-
-# -----------------------
-# askAdminstratorUsername
-# -----------------------
-#
-#
-# This property contains the default value for the administrator's
-# username (the default value is ${scarab.user.username}).
-#
-
-askAdminstratorUsername=${scarab.user.username}
-
-
-# ====================
-# Group: documentation
-# ====================
-#
-# scarab.scarabgen.home
-# scarab.docs.head
-# scarab.docbook.enable
-#
-# Scarab Documentation Properties
-#
-
-scarab.scarabgen.home=../scarab-gen
-scarab.docs.head=${scarab.scarabgen.home}/www/head
-scarab.docbook.enable=true
-
-# ==========================
-# End of Group documentation
-# ==========================
-
-
-# ============
-# Group: maven
-# ============
-#
-# maven.multiproject.type
-# maven.repo.remote
-# maven.docbook.src
-# maven.sdocbook.src.dir
-# maven.sdocbook.files
-# statcvs.exclude
-# statcvs.include
-# statcvs.verbose
-# statcvs.history
-# statcvs.log.options
-# maven.velocity.version
-#
-# Maven Properties
-#
-
-maven.multiproject.type=war
-maven.repo.remote=file:www/repository,http://www.ibiblio.org/maven/,http://repo2.maven.org/maven/,http://mirrors.ibiblio.org/pub/mirrors/maven,http://guest:[email protected]/svn/scarab/trunk/www/repository/,http://maven-plugins.sourceforge.net/maven,http://www.apache.org/dist/java-repository/
-maven.docbook.src=www/book
-maven.sdocbook.src.dir=www/book
-maven.sdocbook.files=**/scarab-*.xml
-statcvs.exclude=www/**/*.*
-statcvs.include=src/**/*.*
-statcvs.verbose=false
-statcvs.history=false
-statcvs.log.options=-d 2004-01-01<
-
-# ----------------------
-# maven.velocity.version
-# ----------------------
-#
-# Version flag for velocity used by maven build.
-# You have to change this value e.g. to "1.5" for maven goal "site".
-# This is necessary for the sake of version incompatiblities
-# of the maven xdoc plugin.
-
-maven.velocity.version=1.6.3
-
-# ==================
-# End of Group maven
-# ==================
-
-
-# ==============
-# Group: eclipse
-# ==============
-#
-# maven.eclipse.output.dir
-# maven.eclipse.classpath.include
-#
-# Maven Eclipse Properties
-#
-
-maven.eclipse.output.dir=src/webapp/WEB-INF/classes
-maven.eclipse.classpath.include=src/conf/conf,src/conf/classes
-
-# ====================
-# End of Group eclipse
-# ====================
-
-
-# ===============
-# Group: netbeans
-# ===============
-#
-# maven.netbeans.exec.rebuild
-# maven.netbeans.exec.build
-#
-# Maven Netbeans Properties
-#
-
-maven.netbeans.exec.rebuild=clean war:war
-maven.netbeans.exec.build=war:war
-
-# =====================
-# End of Group netbeans
-# =====================
-
-
-# =================
-# Group: unit-tests
-# =================
-#
-# maven.junit.fork
-# maven.junit.usefile
-# maven.test.failure.ignore
-#
-# Maven Unit Test Properties
-#
-
-maven.junit.fork=true
-maven.junit.usefile=true
-maven.test.failure.ignore=true
-
-# =======================
-# End of Group unit-tests
-# =======================
-
-
-# =================
-# Group: maven-site
-# =================
-#
-# maven.javadoc.useexternalfile
-# maven.pmd.excludes
-# maven.pmd.includes
-# maven.simian.excludes
-# maven.simian.includes
-# maven.findbugs.excludes
-# maven.findbugs.includes
-# maven.checkstyle.format
-# maven.xdoc.version
-# maven.dist.bin.assembly.dir
-# maven.nsis.build.dir
-#
-# Maven Site Properties
-#
-
-maven.javadoc.useexternalfile=true
-maven.pmd.excludes=**/om/**
-maven.pmd.includes=**/tigris/**
-maven.simian.excludes=**/om/**
-maven.simian.includes=**/tigris/**
-maven.findbugs.excludes=**/om/**
-maven.findbugs.includes=**/tigris/**
-maven.checkstyle.format=turbine
-
-# ------------------
-# maven.xdoc.version
-# ------------------
-#
-#
-# display the date on the site
-# maven.xdoc.date = left
-# Display the version the web site is documenting
-#
-
-maven.xdoc.version=${pom.currentVersion}
-
-# ---------------------------
-# maven.dist.bin.assembly.dir
-# ---------------------------
-#
-#
-# Maven NSIS Properties
-#
-
-maven.dist.bin.assembly.dir=${root.dir}/target/dist
-
-# --------------------
-# maven.nsis.build.dir
-# --------------------
-#
-#
-# Maven NSIS Properties
-#
-
-maven.nsis.build.dir=${root.dir}/target/dist
-
-# =======================
-# End of Group maven-site
-# =======================
\ No newline at end of file
+# ================
\ No newline at end of file
Modified: branches/20120417_mavenPort/scarab_properties.xml
Url: http://scarab.tigris.org/source/browse/scarab/branches/20120417_mavenPort/scarab_properties.xml?view=diff&pathrev=11175&r1=11174&r2=11175
==============================================================================
--- branches/20120417_mavenPort/scarab_properties.xml (original)
+++ branches/20120417_mavenPort/scarab_properties.xml 2012-04-17 03:57:40-0700
@@ -1678,74 +1678,6 @@
</property>
</section>
-
- <section name="DEPLOY (For Source distribution only)">
- <details>
- This section defines some properties, which affect, how the
- webapplication is deployed.
-
- Relation to ant build:
- ----------------------
-
- deploy
-
- NOTE: These properties are only needed in the Source distribution
- and have no effect in the Runtime distribution.
- </details>
-
- <property>
- <name>custom.properties.tmpl</name>
- <default>${root.dir}/project.properties</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- <details>
- This property tells the build system, which template it shall
- use to build the default Runtime properties file.
- Normally the default setting is what you want.
- </details>
- </property>
- <group name="customization">
- <details>
- </details>
-
- <property>
- <name>default.custom.properties</name>
- <default>WEB-INF/conf/defaultCustom.properties</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>custom.properties</name>
- <default>WEB-INF/conf/custom.properties</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- </group>
-
- <group name="buildtime">
- <details>
- </details>
-
- <property>
- <name>scarab.database.ant.buildfile</name>
- <default>WEB-INF/conf/build-database.xml</default>
- <type>Runtime</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>scarab.database.ant.target</name>
- <default>create-db</default>
- <type>Runtime</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- </group>
- </section>
-
<section name="MIGRATION">
<details>
These are some default values that are required for
@@ -2653,473 +2585,4 @@
</property>
</group>
</section>
-
- <section name="ANT">
- <details>
- This section contains the ant related properties.
-
- Relation to ant build:
- ----------------------
- This section directly corresponds to the ant tasks
-
- compile
-
- </details>
-
- <property>
- <name>Name</name>
- <default>Scarab</default>
- <details>
- Name of the project ("Scarab" for the standard distribution).
- </details>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>version</name>
- <default>1.0-b23-dev</default>
- <details>Project version.</details>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>project</name>
- <default>scarab</default>
- <details>
- Name of the project, used for???.
- </details>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>year</name>
- <default>2000-2004</default>
- <details>Year, possibly used for copyright message.</details>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <group name="directory">
- <details>
- Directory structure to which Scarab is built.
- Everything is relative to build.dir
- </details>
-
- <property>
- <name>build.dir</name>
- <default>${root.dir}/target</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>build.project</name>
- <default>${build.dir}/scarab</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>build.project.webinf</name>
- <default>${build.project}/WEB-INF</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>build.project.webinf.lib</name>
- <default>${build.project}/WEB-INF/lib</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>build.sql.scarab</name>
- <default>${build.project.webinf}/sql</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>build.src.scarab</name>
- <default>${build.project.webinf}/src</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>build.dest.scarab</name>
- <default>${build.project.webinf}/classes</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>deploy.dir</name>
- <default>${build.dir}</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>deploy.project</name>
- <default>${deploy.dir}/scarab</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>scarab.torque.schemas</name>
- <default>scarab-schema.xml</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- <details>
- The list of Torque-format schemas used by Scarab.
- This is useful for performing an up-to-date check
- on generated Java code.
- </details>
-
- </property>
- <property>
- <name>repository.dir</name>
- <default>${root.dir}/www/repository</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>lib.dir</name>
- <default>${root.dir}/lib</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>src.dir</name>
- <default>${root.dir}/src</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>extensions.dir</name>
- <default>${root.dir}/extensions</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- </group>
- </section>
-
- <section name="MAVEN">
-
- <property>
- <name>askAdminstratorUsername</name>
- <details>
- This property contains the default value for the administrator's
- username (the default value is ${scarab.user.username}).
- </details>
- <default>${scarab.user.username}</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
-
- <group name="documentation">
- <details>
- Scarab Documentation Properties
- </details>
-
- <property>
- <name>scarab.scarabgen.home</name>
- <default>../scarab-gen</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>scarab.docs.head</name>
- <default>${scarab.scarabgen.home}/www/head</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>scarab.docbook.enable</name>
- <default>true</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- </group>
-
- <group name="maven">
- <details>
- Maven Properties
- </details>
-
- <property>
- <name>maven.multiproject.type</name>
- <default>war</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>maven.repo.remote</name>
- <default>file:www/repository,http://www.ibiblio.org/maven/,http://repo2.maven.org/maven/,http://mirrors.ibiblio.org/pub/mirrors/maven,http://guest:[email protected]/svn/scarab/trunk/www/repository/,http://maven-plugins.sourceforge.net/maven,http://www.apache.org/dist/java-repository/</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>maven.docbook.src</name>
- <default>www/book</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>maven.sdocbook.src.dir</name>
- <default>www/book</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>maven.sdocbook.files</name>
- <default>**/scarab-*.xml</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>statcvs.exclude</name>
- <default>www/**/*.*</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>statcvs.include</name>
- <default>src/**/*.*</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>statcvs.verbose</name>
- <default>false</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>statcvs.history</name>
- <default>false</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>statcvs.log.options</name>
- <default>-d 2004-01-01<</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>maven.velocity.version</name>
- <default>1.6.3</default>
- <type>Build</type>
- <details>Version flag for velocity used by maven build.
- You have to change this value e.g. to "1.5" for maven goal "site".
- This is necessary for the sake of version incompatiblities
- of the maven xdoc plugin.</details>
- </property>
- </group>
-
- <group name="eclipse">
- <details>
- Maven Eclipse Properties
- </details>
-
- <property>
- <name>maven.eclipse.output.dir</name>
- <default>src/webapp/WEB-INF/classes</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>maven.eclipse.classpath.include</name>
- <default>src/conf/conf,src/conf/classes</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- </group>
-
-<group name="netbeans">
- <details>
- Maven Netbeans Properties
- </details>
-
- <property>
- <name>maven.netbeans.exec.rebuild</name>
- <default>clean war:war</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>maven.netbeans.exec.build</name>
- <default>war:war</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- </group>
-
- <group name="unit-tests">
-
- <details>
- Maven Unit Test Properties
- </details>
-
- <property>
- <name>maven.junit.fork</name>
- <default>true</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>maven.junit.usefile</name>
- <default>true</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- <property>
- <name>maven.test.failure.ignore</name>
- <default>true</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
- </group>
-
- <group name="maven-site">
-
- <details>
- Maven Site Properties
- </details>
-
- <property>
- <name>maven.javadoc.useexternalfile</name>
- <default>true</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
-
- <property>
- <name>maven.pmd.excludes</name>
- <default>**/om/**</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
-
- <property>
- <name>maven.pmd.includes</name>
- <default>**/tigris/**</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
-
- <property>
- <name>maven.simian.excludes</name>
- <default>**/om/**</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
-
- <property>
- <name>maven.simian.includes</name>
- <default>**/tigris/**</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
-
- <property>
- <name>maven.findbugs.excludes</name>
- <default>**/om/**</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
-
- <property>
- <name>maven.findbugs.includes</name>
- <default>**/tigris/**</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
-
- <property>
- <name>maven.checkstyle.format</name>
- <default>turbine</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- </property>
-
- <property>
- <name>maven.xdoc.version</name>
- <default>${pom.currentVersion}</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- <details>
- display the date on the site
- maven.xdoc.date = left
- Display the version the web site is documenting
- </details>
- </property>
-
- <property>
- <name>maven.dist.bin.assembly.dir</name>
- <default>${root.dir}/target/dist</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- <details>
- Maven NSIS Properties
- </details>
- </property>
-
- <property>
- <name>maven.nsis.build.dir</name>
- <default>${root.dir}/target/dist</default>
- <type>Build</type>
- <customization modification="optional">advanced</customization>
- <file/>
- <details>
- Maven NSIS Properties
- </details>
- </property>
- </group>
-
- </section>
-
</properties>
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2949074