Scarab commit: svn commit: r11191 - trunk: . build extensions/scarab-maven-plugin extensions/scarab-maven-plugin/site extensions/scarab-maven-plugin/site/xdocs extensions/scarab-maven-plugin/src extensions/scarab-maven-plugin/src/main extensions/scarab-maven-plugin/src/main/java extensions/scarab-maven-plugin/src/main/java/org extensions/scarab-maven-plugin/src/main/java/org/tigris extensions/scarab-maven-plugin/src/main/java/org/tigris/scarab extensions/scarab-maven-plugin/src/main/java/org/tigris/scarab/util extensions/scarab-maven-plugin/src/main/java/org/tigris/scarab/util/build extensions/scarab-maven-plugin/src/main/java/org/tigris/scarab/util/build/l10nchecker extensions/scarab-maven-plugin/src/main/java/org/tigris/scarab/util/build/l10nchecker/issues extensions/scarab-maven-plugin/src/main/java/org/tigris/scarab/util/build/migration extensions/scarab-maven-p
[email protected] Thu, 26 Apr 2012 02:02:34 -0700 (PDT)
| Newsgroups | gmane.comp.java.scarab.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: mcoss
Date: 2012-04-26 02:02:34-0700
New Revision: 11191
Added:
trunk/build-db.bat
- copied unchanged from r11190, /branches/20120417_mavenPort/build-db.bat
trunk/build-jira.bat
- copied unchanged from r11190, /branches/20120417_mavenPort/build-jira.bat
trunk/build-site.bat
- copied unchanged from r11190, /branches/20120417_mavenPort/build-site.bat
trunk/build-source-archives.bat
- copied unchanged from r11190, /branches/20120417_mavenPort/build-source-archives.bat
trunk/build-war.bat
- copied unchanged from r11190, /branches/20120417_mavenPort/build-war.bat
trunk/extensions/scarab-maven-plugin/
- copied from r11190, /branches/20120417_mavenPort/extensions/scarab-maven-plugin/
trunk/pom.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/pom.xml
trunk/site/
- copied from r11190, /branches/20120417_mavenPort/site/
trunk/source-archives.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/source-archives.xml
trunk/src/schema/id_table-schema.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/src/schema/id_table-schema.xml
Replaced:
trunk/extensions/scarab-maven-plugin/site/
- copied from r11190, /branches/20120417_mavenPort/extensions/scarab-maven-plugin/site/
trunk/extensions/scarab-maven-plugin/site/xdocs/
- copied from r11190, /branches/20120417_mavenPort/extensions/scarab-maven-plugin/site/xdocs/
trunk/extensions/scarab-maven-plugin/src/
- copied from r11190, /branches/20120417_mavenPort/extensions/scarab-maven-plugin/src/
trunk/extensions/scarab-maven-plugin/src/main/
- copied from r11190, /branches/20120417_mavenPort/extensions/scarab-maven-plugin/src/main/
trunk/extensions/scarab-maven-plugin/src/main/java/
- copied from r11190, /branches/20120417_mavenPort/extensions/scarab-maven-plugin/src/main/java/
trunk/extensions/scarab-maven-plugin/src/main/java/org/
- copied from r11190, /branches/20120417_mavenPort/extensions/scarab-maven-plugin/src/main/java/org/
trunk/extensions/scarab-maven-plugin/src/main/java/org/tigris/
- copied from r11190, /branches/20120417_mavenPort/extensions/scarab-maven-plugin/src/main/java/org/tigris/
trunk/extensions/scarab-maven-plugin/src/main/java/org/tigris/scarab/
- copied from r11190, /branches/20120417_mavenPort/extensions/scarab-maven-plugin/src/main/java/org/tigris/scarab/
trunk/extensions/scarab-maven-plugin/src/main/java/org/tigris/scarab/util/
- copied from r11190, /branches/20120417_mavenPort/extensions/scarab-maven-plugin/src/main/java/org/tigris/scarab/util/
trunk/extensions/scarab-maven-plugin/src/main/java/org/tigris/scarab/util/build/
- copied from r11190, /branches/20120417_mavenPort/extensions/scarab-maven-plugin/src/main/java/org/tigris/scarab/util/build/
trunk/extensions/scarab-maven-plugin/src/main/java/org/tigris/scarab/util/build/l10nchecker/
- copied from r11190, /branches/20120417_mavenPort/extensions/scarab-maven-plugin/src/main/java/org/tigris/scarab/util/build/l10nchecker/
trunk/extensions/scarab-maven-plugin/src/main/java/org/tigris/scarab/util/build/l10nchecker/issues/
- copied from r11190, /branches/20120417_mavenPort/extensions/scarab-maven-plugin/src/main/java/org/tigris/scarab/util/build/l10nchecker/issues/
trunk/extensions/scarab-maven-plugin/src/main/java/org/tigris/scarab/util/build/migration/
- copied from r11190, /branches/20120417_mavenPort/extensions/scarab-maven-plugin/src/main/java/org/tigris/scarab/util/build/migration/
trunk/extensions/scarab-maven-plugin/src/main/resources/
- copied from r11190, /branches/20120417_mavenPort/extensions/scarab-maven-plugin/src/main/resources/
trunk/extensions/scarab-maven-plugin/src/main/resources/META-INF/
- copied from r11190, /branches/20120417_mavenPort/extensions/scarab-maven-plugin/src/main/resources/META-INF/
trunk/extensions/scarab-maven-plugin/src/main/resources/META-INF/maven/
- copied from r11190, /branches/20120417_mavenPort/extensions/scarab-maven-plugin/src/main/resources/META-INF/maven/
trunk/site/fml/
- copied from r11190, /branches/20120417_mavenPort/site/fml/
trunk/site/fml/faq.fml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/fml/faq.fml
trunk/site/resources/
- copied from r11190, /branches/20120417_mavenPort/site/resources/
trunk/site/resources/databases/
- copied from r11190, /branches/20120417_mavenPort/site/resources/databases/
trunk/site/resources/databases/scarabdb.png
- copied unchanged from r11190, /branches/20120417_mavenPort/site/resources/databases/scarabdb.png
trunk/site/site.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/site.xml
trunk/site/xdocs/ (props changed)
- copied from r11190, /branches/20120417_mavenPort/site/xdocs/
trunk/site/xdocs/changes.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/changes.xml
trunk/site/xdocs/databases/
- copied from r11190, /branches/20120417_mavenPort/site/xdocs/databases/
trunk/site/xdocs/databases/database_independence.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/databases/database_independence.xml
trunk/site/xdocs/databases/hypersonic.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/databases/hypersonic.xml
trunk/site/xdocs/databases/index.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/databases/index.xml
trunk/site/xdocs/databases/mssql.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/databases/mssql.xml
trunk/site/xdocs/databases/mysql-internationalization.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/databases/mysql-internationalization.xml
trunk/site/xdocs/databases/mysql.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/databases/mysql.xml
trunk/site/xdocs/databases/oracle.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/databases/oracle.xml
trunk/site/xdocs/databases/postgresql.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/databases/postgresql.xml
trunk/site/xdocs/databases/schema.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/databases/schema.xml
trunk/site/xdocs/guides.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/guides.xml
trunk/site/xdocs/howto/
- copied from r11190, /branches/20120417_mavenPort/site/xdocs/howto/
trunk/site/xdocs/howto/build-docs-howto.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/howto/build-docs-howto.xml
trunk/site/xdocs/howto/build-howto.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/howto/build-howto.xml
trunk/site/xdocs/howto/customize-howto.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/howto/customize-howto.xml
trunk/site/xdocs/howto/debian-package-howto.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/howto/debian-package-howto.xml
trunk/site/xdocs/howto/firewall-howto.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/howto/firewall-howto.xml
trunk/site/xdocs/howto/index.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/howto/index.xml
trunk/site/xdocs/howto/jira-import-howto.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/howto/jira-import-howto.xml
trunk/site/xdocs/howto/ldap-howto.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/howto/ldap-howto.xml
trunk/site/xdocs/howto/maven-build-howto.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/howto/maven-build-howto.xml
trunk/site/xdocs/howto/migrate-howto.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/howto/migrate-howto.xml
trunk/site/xdocs/howto/release-howto.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/howto/release-howto.xml
trunk/site/xdocs/howto/windowsdomain-howto.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/howto/windowsdomain-howto.xml
trunk/site/xdocs/images/
- copied from r11190, /branches/20120417_mavenPort/site/xdocs/images/
trunk/site/xdocs/images/logo.gif
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/images/logo.gif
trunk/site/xdocs/index.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/index.xml
trunk/site/xdocs/l10ncheckertool.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/l10ncheckertool.xml
trunk/site/xdocs/l10nstatus.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/l10nstatus.xml
trunk/site/xdocs/misc/
- copied from r11190, /branches/20120417_mavenPort/site/xdocs/misc/
trunk/site/xdocs/misc/BranchingOfIssues.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/misc/BranchingOfIssues.xml
trunk/site/xdocs/misc/attributes.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/misc/attributes.xml
trunk/site/xdocs/misc/development.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/misc/development.xml
trunk/site/xdocs/misc/duplicate.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/misc/duplicate.xml
trunk/site/xdocs/misc/httpclient-example.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/misc/httpclient-example.xml
trunk/site/xdocs/misc/i18n.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/misc/i18n.xml
trunk/site/xdocs/misc/index.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/misc/index.xml
trunk/site/xdocs/misc/package_dependencies.gif
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/misc/package_dependencies.gif
trunk/site/xdocs/misc/package_dependencies.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/misc/package_dependencies.xml
trunk/site/xdocs/misc/project_development_tools_and_technology.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/misc/project_development_tools_and_technology.xml
trunk/site/xdocs/misc/scarab-design.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/misc/scarab-design.xml
trunk/site/xdocs/misc/scarab-i18n.png
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/misc/scarab-i18n.png
trunk/site/xdocs/misc/workflow.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/misc/workflow.xml
trunk/site/xdocs/xmlimport/
- copied from r11190, /branches/20120417_mavenPort/site/xdocs/xmlimport/
trunk/site/xdocs/xmlimport/import-issues.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/xmlimport/import-issues.xml
trunk/site/xdocs/xmlimport/index.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/xmlimport/index.xml
trunk/site/xdocs/xmlimport/xml-format.xml
- copied unchanged from r11190, /branches/20120417_mavenPort/site/xdocs/xmlimport/xml-format.xml
Removed:
trunk/build/build-torque.xml
trunk/build/build.xml
trunk/maven-site.bat
trunk/maven.xml
trunk/project.xml
trunk/src/conf/conf/build.xml
trunk/src/java/org/tigris/scarab/util/build/AntL10AnalysisTask.java
trunk/src/java/org/tigris/scarab/util/build/AntPropertyFileGenerator.java
trunk/src/java/org/tigris/scarab/util/build/PropertyFileGenerator.java
trunk/src/java/org/tigris/scarab/util/build/PropertyGetter.java
trunk/src/java/org/tigris/scarab/util/build/l10nchecker/
trunk/src/schema/id-table-schema.xml
trunk/www/book/ant-en.xml
trunk/www/repository/activation/
trunk/www/repository/ant/
trunk/www/repository/aspectj/
trunk/www/repository/avalon-framework/
trunk/www/repository/axis/
trunk/www/repository/bsh/
trunk/www/repository/commons-beanutils/
trunk/www/repository/commons-betwixt/
trunk/www/repository/commons-codec/
trunk/www/repository/commons-collections/
trunk/www/repository/commons-configuration/
trunk/www/repository/commons-dbcp/
trunk/www/repository/commons-digester/
trunk/www/repository/commons-discovery/
trunk/www/repository/commons-email/
trunk/www/repository/commons-fileupload/
trunk/www/repository/commons-http/
trunk/www/repository/commons-httpclient/
trunk/www/repository/commons-io/
trunk/www/repository/commons-jelly/
trunk/www/repository/commons-lang/
trunk/www/repository/commons-logging/
trunk/www/repository/commons-pool/
trunk/www/repository/concurrent/
trunk/www/repository/dnsjava/
trunk/www/repository/docbook/
trunk/www/repository/dom4j/
trunk/www/repository/fulcrum/jars/fulcrum-cache-1.0.5.jar
trunk/www/repository/fulcrum/jars/fulcrum-factory-1.0.3.jar
trunk/www/repository/fulcrum/jars/fulcrum-localization-1.0.5.jar
trunk/www/repository/fulcrum/jars/fulcrum-mimetype-1.0.4.jar
trunk/www/repository/fulcrum/jars/fulcrum-pool-1.0.3.jar
trunk/www/repository/fulcrum/jars/fulcrum-quartz-1.0.jar
trunk/www/repository/fulcrum/jars/fulcrum-testcontainer-1.0.4.jar
trunk/www/repository/fulcrum/jars/fulcrum-upload-1.0.3.jar
trunk/www/repository/fulcrum/jars/fulcrum-xmlrpc-1.0.5.jar
trunk/www/repository/fulcrum/jars/fulcrum-yaafi-1.0.3.jar
trunk/www/repository/hsqldb/
trunk/www/repository/javagroups/
trunk/www/repository/javamail/
trunk/www/repository/jaxrpc/
trunk/www/repository/jcs/
trunk/www/repository/jdbc/
trunk/www/repository/jdom/
trunk/www/repository/jimi/
trunk/www/repository/junit/
trunk/www/repository/log4j/
trunk/www/repository/lucene/
trunk/www/repository/maven/
trunk/www/repository/maven-plugins/
trunk/www/repository/mysql/
trunk/www/repository/opensymphony/
trunk/www/repository/org.samba.jcifs/
trunk/www/repository/oro/
trunk/www/repository/postgresql/
trunk/www/repository/radeox/
trunk/www/repository/regexp/
trunk/www/repository/rome/
trunk/www/repository/saaj/
trunk/www/repository/saxon/
trunk/www/repository/servletapi/
trunk/www/repository/statcvs/
trunk/www/repository/stratum/
trunk/www/repository/torque/
trunk/www/repository/velocity/
trunk/www/repository/village/
trunk/www/repository/wsdl4j/
trunk/www/repository/xalan/
trunk/www/repository/xerces/
trunk/www/repository/xml-apis/
trunk/www/repository/xmlrpc/
trunk/www/repository/xstream/
trunk/xdocs/
Modified:
trunk/ (props changed)
trunk/project.properties
trunk/properties.xsl (props changed)
trunk/scarab_properties.xml
trunk/src/conf/conf/TurbineResources.properties
trunk/src/conf/conf/intake.xml
trunk/src/sql/mysql/create-db.sql
trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b19-1.0a20-1.sql
trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b19-1.0b20-1.sql
trunk/src/sql/oracle/upgrade/oracle-upgrade-1.0b19-1.0b20-1.sql
trunk/src/sql/postgresql/create-db.sql
trunk/src/sql/postgresql/upgrade/postgresql-upgrade-1.0b19-1.0b20-1.sql
trunk/src/sql/scarab-anonymous.sql
trunk/src/sql/scarab-sample-data.sql
trunk/src/sql/scarab-security.sql
trunk/src/test/TestCase.properties
trunk/www/book/eclipse-en.xml
trunk/www/book/ergonomy-en.xml
trunk/www/book/install-en.xml
trunk/www/book/intro-en.xml
trunk/www/book/issues-en.xml
trunk/www/book/maven-en.xml
trunk/www/book/scarab-admin-en.xml
trunk/www/book/scarab-dev-en.xml
trunk/www/book/scarab-user-en.xml
trunk/www/book/workflow1-en.xml
trunk/www/book/workflow2-en.xml
trunk/www/book/xml-rpc-en.xml
trunk/www/repository/README.txt
Log:
MRG - Merged revised Maven build via pom.xml, to replace Scarab's Maven 1.x and Ant build.
Removed: trunk/build/build-torque.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/build/build-torque.xml?view=markup&pathrev=11190
Removed: trunk/build/build.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/build/build.xml?view=markup&pathrev=11190
Removed: trunk/maven-site.bat
Url: http://scarab.tigris.org/source/browse/scarab/trunk/maven-site.bat?view=markup&pathrev=11190
Removed: trunk/maven.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/maven.xml?view=markup&pathrev=11190
Modified: trunk/project.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/project.properties?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/project.properties (original)
+++ trunk/project.properties 2012-04-26 02:02:34-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
Removed: trunk/project.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/project.xml?view=markup&pathrev=11190
Modified: trunk/scarab_properties.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/scarab_properties.xml?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/scarab_properties.xml (original)
+++ trunk/scarab_properties.xml 2012-04-26 02:02:34-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>
Modified: trunk/src/conf/conf/TurbineResources.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/conf/TurbineResources.properties?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/src/conf/conf/TurbineResources.properties (original)
+++ trunk/src/conf/conf/TurbineResources.properties 2012-04-26 02:02:34-0700
@@ -650,7 +650,7 @@
#
# -------------------------------------------------------------------
#
-scarab.build.version=@VERSION@-@BUILD_DATE@
+scarab.build.version=${pom.version}-${build.timestamp}
scarab.email.default.template=Default.vm
scarab.email.reportissue.template=NewIssueNotification.vm
scarab.email.modifyissue.template=ModifyIssue.vm
Removed: trunk/src/conf/conf/build.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/conf/build.xml?view=markup&pathrev=11190
Modified: trunk/src/conf/conf/intake.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/conf/conf/intake.xml?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/src/conf/conf/intake.xml (original)
+++ trunk/src/conf/conf/intake.xml 2012-04-26 02:02:34-0700
@@ -384,7 +384,7 @@
</field>
<field name="Code" key="code" type="String">
<rule name="mask" value="^[:alpha:]+$">intake_CodeMustBeAlpha</rule>
- <rule name="maxLength" value="@SCARAB_MODULE_CODE_LENGTH@"/>
+ <rule name="maxLength" value="${scarab.module.code.length}"/>
</field>
<!--
<field name="Url" key="url" type="String">
@@ -480,7 +480,7 @@
<required-message>intake_FieldRequired</required-message>
</field>
<field name="File" key="d" type="FileItem">
- <rule name="maxLength" value="@SCARAB_FILE_MAX_SIZE@">intake_MaxFileUploadSizeExceeded</rule>
+ <rule name="maxLength" value="${scarab.file.max.size}">intake_MaxFileUploadSizeExceeded</rule>
<required-message>intake_NoFile</required-message>
</field>
<!-- two different fields are used because there is an 'other' field -->
Removed: trunk/src/java/org/tigris/scarab/util/build/AntL10AnalysisTask.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/util/build/AntL10AnalysisTask.java?view=markup&pathrev=11190
Removed: trunk/src/java/org/tigris/scarab/util/build/AntPropertyFileGenerator.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/util/build/AntPropertyFileGenerator.java?view=markup&pathrev=11190
Removed: trunk/src/java/org/tigris/scarab/util/build/PropertyFileGenerator.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/util/build/PropertyFileGenerator.java?view=markup&pathrev=11190
Removed: trunk/src/java/org/tigris/scarab/util/build/PropertyGetter.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/util/build/PropertyGetter.java?view=markup&pathrev=11190
Removed: trunk/src/schema/id-table-schema.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/schema/id-table-schema.xml?view=markup&pathrev=11190
Modified: trunk/src/sql/mysql/create-db.sql
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/sql/mysql/create-db.sql?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/src/sql/mysql/create-db.sql (original)
+++ trunk/src/sql/mysql/create-db.sql 2012-04-26 02:02:34-0700
@@ -1,3 +1,3 @@
-drop database if exists @DB_NAME@;
-create database @DB_NAME@;
-grant all on @DB_NAME@.* to @DATABASE_USERNAME@ identified by '@DATABASE_PASSWORD@';
\ No newline at end of file
+drop database if exists ${scarab.database.name};
+create database ${scarab.database.name};
+grant all on ${scarab.database.name}.* to ${scarab.database.username} identified by '${scarab.database.password}';
\ No newline at end of file
Modified: trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b19-1.0a20-1.sql
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b19-1.0a20-1.sql?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b19-1.0a20-1.sql (original)
+++ trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b19-1.0a20-1.sql 2012-04-26 02:02:34-0700
@@ -8,10 +8,10 @@
* dropdown list attribute.
*/
UPDATE ID_TABLE
- SET TABLE_NAME = REPLACE(TABLE_NAME,'@SCARAB.HTTP.DOMAIN@','@SCARAB.INSTANCE.ID@')
- WHERE TABLE_NAME LIKE '@SCARAB.HTTP.DOMAIN@%';
-UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='@SCARAB.INSTANCE.ID@' where NAME='@SCARAB.HTTP.DOMAIN@';
-UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='@SCARAB.INSTANCE.ID@' where NAME='module-domain';
+ SET TABLE_NAME = REPLACE(TABLE_NAME,'${scarab.http.domain}','${scarab.instance.id}')
+ WHERE TABLE_NAME LIKE '${scarab.http.domain}%';
+UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='${scarab.instance.id}' where NAME='${scarab.http.domain}';
+UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='${scarab.instance.id}' where NAME='module-domain';
UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='@SCARAB.HTTP.PORT' where NAME='scarab.http.port';
-UPDATE SCARAB_MODULE set DOMAIN='@SCARAB.INSTANCE.ID@';
-UPDATE SCARAB_ISSUE set ID_DOMAIN='@SCARAB.INSTANCE.ID@';
+UPDATE SCARAB_MODULE set DOMAIN='${scarab.instance.id}';
+UPDATE SCARAB_ISSUE set ID_DOMAIN='${scarab.instance.id}';
Modified: trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b19-1.0b20-1.sql
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b19-1.0b20-1.sql?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b19-1.0b20-1.sql (original)
+++ trunk/src/sql/mysql/upgrade/mysql-upgrade-1.0b19-1.0b20-1.sql 2012-04-26 02:02:34-0700
@@ -8,10 +8,10 @@
* dropdown list attribute.
*/
UPDATE ID_TABLE
- SET TABLE_NAME = REPLACE(TABLE_NAME,'@SCARAB.HTTP.DOMAIN@','@SCARAB.INSTANCE.ID@')
- WHERE TABLE_NAME LIKE '@SCARAB.HTTP.DOMAIN@%';
-UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='@SCARAB.INSTANCE.ID@' where NAME='@SCARAB.HTTP.DOMAIN@';
-UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='@SCARAB.INSTANCE.ID@' where NAME='module-domain';
+ SET TABLE_NAME = REPLACE(TABLE_NAME,'${scarab.http.domain}','${scarab.instance.id}')
+ WHERE TABLE_NAME LIKE '${scarab.http.domain}%';
+UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='${scarab.instance.id}' where NAME='${scarab.http.domain}';
+UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='${scarab.instance.id}' where NAME='module-domain';
UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='@SCARAB.HTTP.PORT@' where NAME='scarab.http.port';
-UPDATE SCARAB_MODULE set DOMAIN='@SCARAB.INSTANCE.ID@';
-UPDATE SCARAB_ISSUE set ID_DOMAIN='@SCARAB.INSTANCE.ID@';
+UPDATE SCARAB_MODULE set DOMAIN='${scarab.instance.id}';
+UPDATE SCARAB_ISSUE set ID_DOMAIN='${scarab.instance.id}';
Modified: trunk/src/sql/oracle/upgrade/oracle-upgrade-1.0b19-1.0b20-1.sql
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/sql/oracle/upgrade/oracle-upgrade-1.0b19-1.0b20-1.sql?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/src/sql/oracle/upgrade/oracle-upgrade-1.0b19-1.0b20-1.sql (original)
+++ trunk/src/sql/oracle/upgrade/oracle-upgrade-1.0b19-1.0b20-1.sql 2012-04-26 02:02:34-0700
@@ -6,10 +6,10 @@
*
*/
UPDATE ID_TABLE
- SET TABLE_NAME = REPLACE(TABLE_NAME,'@SCARAB.HTTP.DOMAIN@','@SCARAB.INSTANCE.ID@')
- WHERE TABLE_NAME LIKE '@SCARAB.HTTP.DOMAIN@%';
-UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='@SCARAB.INSTANCE.ID@' where NAME='@SCARAB.HTTP.DOMAIN@';
-UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='@SCARAB.INSTANCE.ID@' where NAME='module-domain';
+ SET TABLE_NAME = REPLACE(TABLE_NAME,'${scarab.http.domain}','${scarab.instance.id}')
+ WHERE TABLE_NAME LIKE '${scarab.http.domain}%';
+UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='${scarab.instance.id}' where NAME='${scarab.http.domain}';
+UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='${scarab.instance.id}' where NAME='module-domain';
UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='@SCARAB.HTTP.PORT@' where NAME='scarab.http.port';
-UPDATE SCARAB_MODULE set DOMAIN='@SCARAB.INSTANCE.ID@';
-UPDATE SCARAB_ISSUE set ID_DOMAIN='@SCARAB.INSTANCE.ID@';
+UPDATE SCARAB_MODULE set DOMAIN='${scarab.instance.id}';
+UPDATE SCARAB_ISSUE set ID_DOMAIN='${scarab.instance.id}';
Modified: trunk/src/sql/postgresql/create-db.sql
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/sql/postgresql/create-db.sql?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/src/sql/postgresql/create-db.sql (original)
+++ trunk/src/sql/postgresql/create-db.sql 2012-04-26 02:02:34-0700
@@ -1,5 +1,5 @@
-drop database @DB_NAME@;
-drop user @DATABASE_USERNAME@;
-create user @DATABASE_USERNAME@ with encrypted password '@DATABASE_PASSWORD@';
-create database @DB_NAME@ with owner @DATABASE_USERNAME@;
+drop database ${scarab.database.name};
+drop user ${scarab.database.username};
+create user ${scarab.database.username} with encrypted password '${scarab.database.password}';
+create database ${scarab.database.name} with owner ${scarab.database.username};
Modified: trunk/src/sql/postgresql/upgrade/postgresql-upgrade-1.0b19-1.0b20-1.sql
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/sql/postgresql/upgrade/postgresql-upgrade-1.0b19-1.0b20-1.sql?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/src/sql/postgresql/upgrade/postgresql-upgrade-1.0b19-1.0b20-1.sql (original)
+++ trunk/src/sql/postgresql/upgrade/postgresql-upgrade-1.0b19-1.0b20-1.sql 2012-04-26 02:02:34-0700
@@ -6,10 +6,10 @@
*
*/
UPDATE ID_TABLE
- SET TABLE_NAME = REPLACE(TABLE_NAME,'@SCARAB.HTTP.DOMAIN@','@SCARAB.INSTANCE.ID@')
- WHERE TABLE_NAME LIKE '@SCARAB.HTTP.DOMAIN@%';
-UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='@SCARAB.INSTANCE.ID@' where NAME='@SCARAB.HTTP.DOMAIN@';
-UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='@SCARAB.INSTANCE.ID@' where NAME='module-domain';
+ SET TABLE_NAME = REPLACE(TABLE_NAME,'${scarab.http.domain}','${scarab.instance.id}')
+ WHERE TABLE_NAME LIKE '${scarab.http.domain}%';
+UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='${scarab.instance.id}' where NAME='${scarab.http.domain}';
+UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='${scarab.instance.id}' where NAME='module-domain';
UPDATE SCARAB_GLOBAL_PARAMETER set VALUE='@SCARAB.HTTP.PORT@' where NAME='scarab.http.port';
-UPDATE SCARAB_MODULE set DOMAIN='@SCARAB.INSTANCE.ID@';
-UPDATE SCARAB_ISSUE set ID_DOMAIN='@SCARAB.INSTANCE.ID@';
+UPDATE SCARAB_MODULE set DOMAIN='${scarab.instance.id}';
+UPDATE SCARAB_ISSUE set ID_DOMAIN='${scarab.instance.id}';
Modified: trunk/src/sql/scarab-anonymous.sql
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/sql/scarab-anonymous.sql?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/src/sql/scarab-anonymous.sql (original)
+++ trunk/src/sql/scarab-anonymous.sql 2012-04-26 02:02:34-0700
@@ -1,7 +1,7 @@
-- Create an account for anonymous user
INSERT INTO TURBINE_USER (USER_ID, LOGIN_NAME, PASSWORD_VALUE, FIRST_NAME, LAST_NAME, EMAIL, CONFIRM_VALUE, MODIFIED, CREATED, LAST_LOGIN)
- VALUES (9, '@ANONYMOUS_USERNAME@', 'NWoZK3kTsExUV00Ywo1G5jlUKKs=', 'Scarab', 'anonymous', '[email protected]', 'CONFIRMED', null, null, null );
+ VALUES (9, '${scarab.anonymous.username}', 'NWoZK3kTsExUV00Ywo1G5jlUKKs=', 'Scarab', 'anonymous', '[email protected]', 'CONFIRMED', null, null, null );
-- Script to fill the tables with default roles and permissions
@@ -11,7 +11,7 @@
insert into TURBINE_ROLE_PERMISSION (ROLE_ID, PERMISSION_ID)
select TURBINE_ROLE.ROLE_ID, TURBINE_PERMISSION.PERMISSION_ID
from TURBINE_ROLE, TURBINE_PERMISSION
- where TURBINE_ROLE.ROLE_NAME = '@ANONYMOUS_ROLENAME@'
+ where TURBINE_ROLE.ROLE_NAME = '${scarab.anonymous.rolename}'
and TURBINE_PERMISSION.PERMISSION_NAME in (
'Issue | Search',
'Issue | View')
@@ -22,5 +22,5 @@
INSERT INTO TURBINE_USER_GROUP_ROLE ( USER_ID, GROUP_ID, ROLE_ID )
SELECT TURBINE_USER.USER_ID, SCARAB_MODULE.MODULE_ID, TURBINE_ROLE.ROLE_ID from
TURBINE_USER, SCARAB_MODULE, TURBINE_ROLE
-WHERE TURBINE_USER.LOGIN_NAME = '@ANONYMOUS_USERNAME@' AND
-TURBINE_ROLE.ROLE_NAME in ('@ANONYMOUS_ROLENAME@');
\ No newline at end of file
+WHERE TURBINE_USER.LOGIN_NAME = '${scarab.anonymous.username}' AND
+TURBINE_ROLE.ROLE_NAME in ('${scarab.anonymous.username}');
\ No newline at end of file
Modified: trunk/src/sql/scarab-sample-data.sql
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/sql/scarab-sample-data.sql?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/src/sql/scarab-sample-data.sql (original)
+++ trunk/src/sql/scarab-sample-data.sql 2012-04-26 02:02:34-0700
@@ -18,8 +18,8 @@
-- Id table
-INSERT INTO ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (1000, '@SCARAB.INSTANCE.ID@-PACD',2,1);
-INSERT INTO ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (1001, '@SCARAB.INSTANCE.ID@-PACS',2,1);
+INSERT INTO ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (1000, '${scarab.instance.id}-PACD',2,1);
+INSERT INTO ID_TABLE (id_table_id, table_name, next_id, quantity) VALUES (1001, '${scarab.instance.id}-PACS',2,1);
-- R_MODULE_ISSUE_TYPE
-- module_id, issue_type_id,active,display, preferred_order, dedupe,
Modified: trunk/src/sql/scarab-security.sql
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/sql/scarab-security.sql?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/src/sql/scarab-security.sql (original)
+++ trunk/src/sql/scarab-security.sql 2012-04-26 02:02:34-0700
@@ -4,7 +4,7 @@
-- Remember to set a good password for this user in a production system!
INSERT INTO TURBINE_USER (USER_ID, LOGIN_NAME, PASSWORD_VALUE, FIRST_NAME, LAST_NAME, EMAIL, CONFIRM_VALUE, MODIFIED, CREATED, LAST_LOGIN)
- VALUES (1, '@ADMIN_USERNAME@', 'NWoZK3kTsExUV00Ywo1G5jlUKKs=', 'Scarab', 'Administrator', '[email protected]', 'CONFIRMED', null, null, null);
+ VALUES (1, '${scarab.user.username}', 'NWoZK3kTsExUV00Ywo1G5jlUKKs=', 'Scarab', 'Administrator', '[email protected]', 'CONFIRMED', null, null, null);
-- root module
INSERT INTO SCARAB_MODULE(MODULE_ID, MODULE_NAME, MODULE_CODE, MODULE_DESCRIPTION, MODULE_URL, PARENT_ID, CLASS_KEY)
@@ -210,11 +210,11 @@
drop table xxxx_populate_RolePermission;
--- Assign the user '@ADMIN_USERNAME@' a system-wide role 'Root'
+-- Assign the user '${scarab.user.username}' a system-wide role 'Root'
INSERT INTO TURBINE_USER_GROUP_ROLE ( USER_ID, GROUP_ID, ROLE_ID )
SELECT TURBINE_USER.USER_ID, SCARAB_MODULE.MODULE_ID, TURBINE_ROLE.ROLE_ID from
TURBINE_USER, SCARAB_MODULE, TURBINE_ROLE
-WHERE TURBINE_USER.LOGIN_NAME = '@ADMIN_USERNAME@' AND
+WHERE TURBINE_USER.LOGIN_NAME = '${scarab.user.username}' AND
SCARAB_MODULE.MODULE_ID = 0
AND TURBINE_ROLE.ROLE_NAME in ('Root');
Modified: trunk/src/test/TestCase.properties
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/test/TestCase.properties?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/src/test/TestCase.properties (original)
+++ trunk/src/test/TestCase.properties 2012-04-26 02:02:34-0700
@@ -1,4 +1,4 @@
# properties only used in testing
# for other properties see TestTurbineConfiguration.xml
-log4j.file=../../target/scarab/WEB-INF/conf/log4j.properties
+log4j.file=WEB-INF/conf/log4j.properties
unittest.teardown.shutdownServices=false
Removed: trunk/www/book/ant-en.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/book/ant-en.xml?view=markup&pathrev=11190
Modified: trunk/www/book/eclipse-en.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/book/eclipse-en.xml?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/www/book/eclipse-en.xml (original)
+++ trunk/www/book/eclipse-en.xml 2012-04-26 02:02:34-0700
@@ -5,23 +5,23 @@
<sect2>
<title>Getting the subclipse plugin</title>
<simpara>You will need the Subclipse plugin to connect to the Subversion repository that hosts and manages the Scarab source code base.</simpara>
- <simpara>If you do not have this plugin already installed, you will find detailed installation instructions at this URL :
+ <simpara>If you do not have this plugin already installed, you will find detailed installation instructions at this URL:
<ulink url="http://subclipse.tigris.org/install.html">http://subclipse.tigris.org/install.html</ulink>
</simpara>
</sect2>
<sect2>
<title>Connecting to the Scarab Subversion repository</title>
- <para>Select the 'SVN Repository Exploring' perspective :</para>
+ <para>Select the 'SVN Repository Exploring' perspective:</para>
<screenshot>
<graphic fileref="images/svn03.png"/>
</screenshot>
- <para>Right-click in the SVN Repository view to connect to a new Subversion repository :</para>
+ <para>Right-click in the SVN Repository view to connect to a new Subversion repository:</para>
<screenshot>
<graphic fileref="images/svn04.png"/>
</screenshot>
- <para>The connection URL is :: <emphasis>http://scarab.tigris.org/svn/scarab</emphasis>
+ <para>The connection URL is: <emphasis>http://scarab.tigris.org/svn/scarab</emphasis>
</para>
- <simpara>and the Root URL is : <emphasis>http://scarab.tigris.org/svn</emphasis>
+ <simpara>and the Root URL is: <emphasis>http://scarab.tigris.org/svn</emphasis>
</simpara>
<para>If you are a Scarab committer, use your tigris.org login and password to connect; otherwise you do not need any particular identification and you may leave the <emphasis>User</emphasis> and
<emphasis>Password</emphasis> fields blank (though it seems that any <emphasis>User/Password</emphasis> will work here).</para>
@@ -32,11 +32,11 @@
<screenshot>
<graphic fileref="images/svn06.png"/>
</screenshot>
- <para>You can then use 'Checkout As Project', which allows you to rename the project (otherwise Eclipse would name it <emphasis>trunk</emphasis>, which is not that meaningful). </para>
+ <para>You can then use 'Checkout As Project, which allows you to rename the project (otherwise Eclipse would name it <emphasis>trunk</emphasis>, which is not that meaningful). </para>
<screenshot>
<graphic fileref="images/svn07.png"/>
</screenshot>
- <para>The 'New Project' wizard appears. Choose 'Java project'.</para>
+ <para>The 'New Project' wizard appears. Choose 'Java project'.</para>
<screenshot>
<graphic fileref="images/svn08.png"/>
</screenshot>
@@ -48,7 +48,7 @@
<screenshot>
<graphic fileref="images/svn09b.png"/>
</screenshot>
- <para>Last step : it is best to change the <emphasis>Default output folder</emphasis> to :<computeroutput>scarab/target/webapps/scarab/scarab/WEB-INF/classes</computeroutput>
+ <para>Last step: it is best to change the <emphasis>Default output folder</emphasis> to:<computeroutput>scarab/target/webapps/scarab/scarab/WEB-INF/classes</computeroutput>
</para>
<screenshot>
<graphic fileref="images/svn10.png"/>
@@ -62,10 +62,13 @@
<simpara>The Sysdeo Tomcat plugin allows you to start and stop Tomcat from Eclipse and makes debugging the application under development easier.</simpara>
<simpara>Download the 3.1 beta version from this URL: <ulink url="http://www.sysdeo.com/eclipse/tomcatplugin">http://www.sysdeo.com/eclipse/tomcatplugin</ulink>.</simpara>
<simpara>To install this plugin, all you need is to uncompress the ZIP archive in the <computeroutput>plugins</computeroutput> directory of your Eclipse installation.</simpara>
+ <note>
+ <simpara>Please note, that maven 1.x was removed and another, incompatible Maven version, 2 or higer, is used for building Scarab now. Current doumentation files are therefore outdated.</simpara>
+ </note>
</sect2>
<sect2>
<title>Generating the required files with Maven</title>
- <simpara>At the root of your project, type the following commands :</simpara>
+ <simpara>At the root of your project, type the following commands:</simpara>
<simpara>
<computeroutput>maven war:inplace</computeroutput>
</simpara>
@@ -91,7 +94,7 @@
<simpara>Select the 4.0.x version</simpara>
</listitem>
<listitem>
- <simpara>Tomcat directory : the <computeroutput>tomcat</computeroutput> directory in your Scarab project</simpara>
+ <simpara>Tomcat directory: the <computeroutput>tomcat</computeroutput> directory in your Scarab project</simpara>
</listitem>
<listitem>
<simpara>Context declaration in server.xml</simpara>
@@ -100,7 +103,7 @@
</sect3>
<sect3>
<title>Setting the project Tomcat properties</title>
- <simpara>In Project | Properties | Tomcat :</simpara>
+ <simpara>In Project | Properties | Tomcat:</simpara>
<screenshot>
<graphic fileref="images/sysdeo1.png"/>
</screenshot>
Modified: trunk/www/book/ergonomy-en.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/book/ergonomy-en.xml?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/www/book/ergonomy-en.xml (original)
+++ trunk/www/book/ergonomy-en.xml 2012-04-26 02:02:34-0700
@@ -3,27 +3,27 @@
<sect1>
<title>Scarab navigation</title>
<para>The Scarabinterface is organized to allow access to all major functionality from anywhere in the application. Each of the action screens provides relevant information along with links to access further details as needed. A unified and consistent interface allows you to easily recognize the types of information and actions available on each screen.</para>
- <para>Each screen provides the following navigational aids :</para>
+ <para>Each screen provides the following navigational aids:</para>
<itemizedlist>
<listitem>
<para>
- <emphasis role="bold">The Left navigation bar :</emphasis> The navigation bar is organized by issue type, then by function. To access functionality within a specific issue type, select the title of the issue type on the left navigation bar. The functionality available to that issue type will appear below the title.</para>
+ <emphasis role="bold">The Left navigation bar:</emphasis> The navigation bar is organized by issue type, then by function. To access functionality within a specific issue type, select the title of the issue type on the left navigation bar. The functionality available to that issue type will appear below the title.</para>
</listitem>
<listitem>
<para>
- <emphasis role="bold">The Query bar :</emphasis> The query bar provides access to the search tools. The issue ID box allows you to access a specific issue number. The select query box provides access to the Advanced and Custom query features. If you have any saved queries, they will appear in the select query box.</para>
+ <emphasis role="bold">The Query bar:</emphasis> The query bar provides access to the search tools. The issue ID box allows you to access a specific issue number. The select query box provides access to the Advanced and Custom query features. If you have any saved queries, they will appear in the select query box.</para>
</listitem>
<listitem>
<para>
- <emphasis role="bold">Section titles :</emphasis> Most information screens are organized in tabular format. Each section is presented with an informative section header, describing the section and, often, providing general information about the section. Column headers with arrows can be used to change the sort order for that table. For the sort column, the title has an arrow indicating the direction of the sort: the default is ascending. To change the direction of the sort click on the arrow.</para>
+ <emphasis role="bold">Section titles:</emphasis> Most information screens are organized in tabular format. Each section is presented with an informative section header, describing the section and, often, providing general information about the section. Column headers with arrows can be used to change the sort order for that table. For the sort column, the title has an arrow indicating the direction of the sort: the default is ascending. To change the direction of the sort click on the arrow.</para>
</listitem>
<listitem>
<para>
- <emphasis role="bold">Buttons :</emphasis> Are used to indicate a set of actions that can be performed. Often you will find more than one set of buttons on a page. Buttons directly below a section will perform actions on the section only, if you have you may find an Update Optionsbutton beside an attribute selector in one section. This indicates that if you change the attribute clicking the button will change the options available to that attribute.</para>
+ <emphasis role="bold">Buttons:</emphasis> Are used to indicate a set of actions that can be performed. Often you will find more than one set of buttons on a page. Buttons directly below a section will perform actions on the section only, if you have you may find an Update Optionsbutton beside an attribute selector in one section. This indicates that if you change the attribute clicking the button will change the options available to that attribute.</para>
</listitem>
<listitem>
<para>
- <emphasis role="bold">Checkboxes :</emphasis> Are used to select list items for modification.</para>
+ <emphasis role="bold">Checkboxes:</emphasis> Are used to select list items for modification.</para>
</listitem>
</itemizedlist>
<para>In many cases, helpful information is included directly on the screens to clarify unusual operations. Error messages are provided in line to help identify where the error occurred and specific means for remedy.</para>
Modified: trunk/www/book/install-en.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/book/install-en.xml?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/www/book/install-en.xml (original)
+++ trunk/www/book/install-en.xml 2012-04-26 02:02:34-0700
@@ -98,7 +98,7 @@
</sect2>
<sect2>
<title>Gathering the other elements required for the Scarab installation</title>
- <para>To perform the Scarab installation, you will need three more things: a Java SDK, Ant and -- of course -- Scarab itself.</para>
+ <para>To perform the Scarab installation, you will need three more things: a Java SDK, Maven and -- of course -- Scarab itself.</para>
<sect3>
<title>Download and install a Java SDK</title>
<para>If you don't have a Java SDK handy (pre-installed on some systems such as MacOS X or certain Linux distributions), you need to download and install one. Be careful: you need a Java 2 SDK and not only a JRE (Java Runtime Environment) because you will need to compile Scarab.</para>
@@ -107,27 +107,15 @@
<para>Make sure the JAVA_HOME environment variable correctly points to the directory in which your SDK is installed.</para>
</sect3>
<sect3>
- <title>Download and install Ant</title>
- <para>To build Scarab, you will need the Ant build system.</para>
- <para>You can download Ant from <ulink url="http://ant.apache.org">http://ant.apache.org</ulink>.</para>
- <para>The Ant version should be 1.5.1 or greater.</para>
- <para>Make sure the ANT_HOME environment variable correctly points to the directory in which Ant is installed</para>
- <caution>
- <simpara>The version of ant that is supplied by RedHat with RHEL3 (latest update is ant-1.5.2-23) throws an exception when running the create-db target.</simpara>
- <simpara>The exception is:</simpara>
- <simpara>
- <computeroutput>BUILD FAILED file:/export/home/admin/scarab/target/scarab/WEB-INF/conf/runtime-torque.xml:72: taskdef class org.apache.torque.task.TorqueDocumentationTask cannot be found</computeroutput>
- </simpara>
- <simpara>Work Around: use the version of ant that comes bundled with SCARAB:</simpara>
- <itemizedlist>
- <listitem><simpara>Copy it from <computeroutput>$SCARAB_ROOT/www/repository/ant/jars/ant-1.5.3-1.jar</computeroutput> to <computeroutput>$SCARAB_ROOT}/build</computeroutput></simpara></listitem>
- <listitem><simpara>From $SCARAB_ROOT/build run <computeroutput>java âjar ant-1.5.3-1.jar create-db</computeroutput></simpara></listitem>
- </itemizedlist>
- </caution>
+ <title>Download and install Maven</title>
+ <para>To build Scarab, you will need the Maven build system.</para>
+ <para>You can download Maven from <ulink url="http://maven.apache.org">http://maven.apache.org</ulink>.</para>
+ <para>The Maven version should be 3.0.3 or greater.</para>
+ <para>Make sure the MAVEN_HOME environment variable correctly points to the directory in which Maven is installed</para>
</sect3>
<sect3>
<title>Download Scarab</title>
- <para>You need of course to download Scarab itself. You will find the latest version (1.0-b21) at the following URL: <ulink url="http://scarab.tigris.org/servlets/ProjectDocumentList">http://scarab.tigris.org/servlets/ProjectDocumentList</ulink>.</para>
+ <para>You need of course to download Scarab itself. You will find the latest version (1.0.23) at the following URL: <ulink url="http://scarab.tigris.org/servlets/ProjectDocumentList">http://scarab.tigris.org/servlets/ProjectDocumentList</ulink>.</para>
</sect3>
</sect2>
</sect1>
@@ -412,31 +400,24 @@
<simpara>Go to the build directory and launch ant</simpara>
<informalexample>
<programlisting>
- ant
+ mvn clean compile
</programlisting>
</informalexample>
<simpara>This command simply compiles the source code. Run the following command to get a WAR file for Scarab:</simpara>
<informalexample>
<programlisting>
- ant war
+ mvn clean package
</programlisting>
</informalexample>
<simpara>The compiled and archived output should be found in <computeroutput>/target</computeroutput> directory of Scarab.</simpara>
</sect2>
<sect2>
<title>Rebuild Scarab after failure</title>
- <simpara>The whole property settings have been copied from the build environment, thus the configuration may be invalid. In order to fix this you must regenerate the configuration (not the class files!). You can use ant for this:</simpara>
- <informalexample>
- <programlisting>
- cd build
- ant create-custom-property-file
- </programlisting>
- </informalexample>
+ <simpara>The whole property settings have been copied from the build environment, thus the configuration may be invalid. In order to fix this you must regenerate the configuration (not the class files!).</simpara>
<simpara>But definitely the safest way to proceed is simply rebuilding everything:</simpara>
<informalexample>
<programlisting>
- ant clean
- ant
+ mvn clean package
</programlisting>
</informalexample>
</sect2>
@@ -450,44 +431,42 @@
<simpara>Run the following command to build Scarab's deafult database including all default and sample data:</simpara>
<informalexample>
<programlisting>
- ant create-db
+ mvn initialize scarab:create-db
</programlisting>
</informalexample>
</sect3>
<sect3>
<title>JIRA templates</title>
<simpara>
- By default, a module is created with issue-types that match the
- structure of JIRA, enabling transfer of issues from JIRA to Scarab.
- If you don't want this extra module in your issue tracker, then you
- can pass the option "-Dskip.jira.templates.data=true" to ant, e.g.:
+ To import some issue-types that match the
+ structure of JIRA, build the Scarab database and run the following command.
</simpara>
<informalexample>
<programlisting>
- ant create-db -Dskip.jira.templates.data=true
+ mvn initialize scarab:import-jira-templates
</programlisting>
</informalexample>
<note>
- <simpara>This option is independent of 'skip.sample.data' or 'skip.default.data' (see next chapter), so they can be specified together.</simpara>
+ <simpara>This option is not independent of 'scarab.database.build.mode'. You have to install the default data as well.</simpara>
</note>
</sect3>
<sect3>
<title>Sample data</title>
<simpara>
- By default, some sample data are put into Scarab's database. There are
- some modules and already entered issues. To avoid this,
- you can pass the option "-Dskip.sample.data=true" to ant. To skip all
+ By default, only basic data are put into Scarab's database. There are no
+ modules and no already entered issues. You may want to avoid this e.g. for presentation or tests. If so
+ you can pass the option "scarab.database.build.mode" to Maven. To import all
default global data, too, as there are some attributes, issue-types and so on,
- you can additionally pass the option "-Dskip.default.data=true" to ant:
+ pass the option like this:
</simpara>
<informalexample>
<programlisting>
- ant create-db -Dskip.sample.data=true -Dskip.default.data=true
+ mvn initialize scarab:create-db -Dscarab.database.build.mode=default
</programlisting>
</informalexample>
- <note>
- <simpara>This options are independent of 'skip.jira.templates.data', so they can be specified together.</simpara>
- </note>
+ <simpara>
+ or use "sample" as value for "scarab.database.build.mode" to import some sample moudles and stuff, too.
+ </simpara>
</sect3>
</sect2>
<sect2>
Modified: trunk/www/book/intro-en.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/book/intro-en.xml?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/www/book/intro-en.xml (original)
+++ trunk/www/book/intro-en.xml 2012-04-26 02:02:34-0700
@@ -3,43 +3,43 @@
<title>Introduction</title>
<sect1>
<!-- Source: the ##Introduction section in the online help -->
- <title>What is Scarab ?</title>
+ <title>What is Scarab?</title>
<para>Scarab is a highly configurable issue tracking tool that can be used for all types of projects: technical and non-technical alike. Because all parameters in the system are configurable, this tool meets the needs of the project as well as the individual user. Each implementation can be configured directly to the workflow processes of the project through the definition of issue types and attributes. The user interface is designed to be accessible and constant: once you become familiar with the look and feel you will find new processes quick to master.</para>
- <para>Scarab provides a robust set of tools for issue management :</para>
+ <para>Scarab provides a robust set of tools for issue management:</para>
<itemizedlist>
<listitem>
<para>
- <emphasis role="bold">Issue entry :</emphasis> The issue entry process is designed to help users create meaningful issues and avoid duplication. Attributes are used to describe issues and to check the issue database for similar entries. If any duplicates are found, the user has the opportunity to review potential duplicates, add comments to like issues or modify their issue before committing it to the database. </para>
+ <emphasis role="bold">Issue entry:</emphasis> The issue entry process is designed to help users create meaningful issues and avoid duplication. Attributes are used to describe issues and to check the issue database for similar entries. If any duplicates are found, the user has the opportunity to review potential duplicates, add comments to like issues or modify their issue before committing it to the database. </para>
</listitem>
<listitem>
<para>
- <emphasis role="bold">Templates for issue entry :</emphasis> Frequently entered issue criteria can be saved in templates for speedy entry. Files can be attached to an issue, and are tracked directly with their issue. Users can add and edit comments to issues as needed. Users can access and review the complete issue history while viewing an issue. </para>
+ <emphasis role="bold">Templates for issue entry:</emphasis> Frequently entered issue criteria can be saved in templates for speedy entry. Files can be attached to an issue, and are tracked directly with their issue. Users can add and edit comments to issues as needed. Users can access and review the complete issue history while viewing an issue. </para>
</listitem>
<listitem>
<para>
- <emphasis role="bold">Issue query :</emphasis> Accessing issues in the database is simple using the query feature. Users can easily find, access and modify issues individually or in groups. The advanced query feature allows the user to create detailed issue searches, specifying values for multiple attributes and limiting their search to specific date or issue number ranges. The Custom Query feature allows the user to search by text string-the user can specify a set of information to compare against issues in the database. Frequently used queries can be saved and easily run.</para>
+ <emphasis role="bold">Issue query:</emphasis> Accessing issues in the database is simple using the query feature. Users can easily find, access and modify issues individually or in groups. The advanced query feature allows the user to create detailed issue searches, specifying values for multiple attributes and limiting their search to specific date or issue number ranges. The Custom Query feature allows the user to search by text string-the user can specify a set of information to compare against issues in the database. Frequently used queries can be saved and easily run.</para>
</listitem>
<listitem>
<para>
- <emphasis role="bold">Reports :</emphasis> The robust reports interface allows the user to create and save reports. Reports provide customizable and meaningful metrics.</para>
+ <emphasis role="bold">Reports:</emphasis> The robust reports interface allows the user to create and save reports. Reports provide customizable and meaningful metrics.</para>
</listitem>
<listitem>
<para>
- <emphasis role="bold">Email notifications :</emphasis> As important events occur, email is generated and sent to all parties associated with the event. Alert emails contain links to views of the event.</para>
+ <emphasis role="bold">Email notifications:</emphasis> As important events occur, email is generated and sent to all parties associated with the event. Alert emails contain links to views of the event.</para>
</listitem>
</itemizedlist>
<para>Scarab is written in Java and based on web technologies. Scarab stores its informations in a database, often MySQL but other databases such as Oracle and PostgreSQL are supported.</para>
<sect2>
- <title>How does Scarab differ from other issue-tracking systems ?</title>
+ <title>How does Scarab differ from other issue-tracking systems?</title>
<para>Scarab is highly customisable. Scarab has no predefined or hard-coded workflow (that would define what happens as an issue changes from the 'Open' to the 'Closed' status. There are no predefined artefact types (such as bug report, improvement, etc.) You are completely free to define your issue types the way that suits you best. Scarab may be less easy to understand and use at the beginning but you will get a tool that suits your needs better at the end.</para>
<para>Most other issue tracking systems (open-source or commercial) have an issue processing logic that is embedded in the application. This means that you are often caught in the logic defined by these systems. Scarab does not limit you that way.</para>
</sect2>
</sect1>
<sect1>
<title>Scarab history</title>
- <para>To stay short, let's say that Scarab was born from the passion of a highly talented developer : Jon Scott Stevens. Jon was a key figure in the Apache Jakarta project, where he played a major role in the Velocity and Turbine projects.</para>
+ <para>To stay short, let's say that Scarab was born from the passion of a highly talented developer: Jon Scott Stevens. Jon was a key figure in the Apache Jakarta project, where he played a major role in the Velocity and Turbine projects.</para>
<para>His aim was to design and develop a compelling replacement for Bugzilla.</para>
- <para>CollabNet gave him an opportunity to develop this software in open-source — but also to integrate this tool in their collaborative development suite.</para>
+ <para>CollabNet gave him an opportunity to develop this software in open-source, but also to integrate this tool in their collaborative development suite.</para>
<para>Today, CollabNet is no longer the driving force behind the development of Scarab; they left this role to a small team of developers from around the world but continue to provide support and useful advice on certain occasions.</para>
</sect1>
<sect1>
@@ -47,28 +47,28 @@
<title>Scarab functionality at a glance</title>
<itemizedlist>
<listitem>
- <para>A full set of functions such as those found in other issue tracking systems : issue entry, queries, reports, event notification, collaborative accumulation of comments, dependency tracking.</para>
+ <para>A full set of functions such as those found in other issue tracking systems: issue entry, queries, reports, event notification, collaborative accumulation of comments, dependency tracking.</para>
</listitem>
<listitem>
<para>On top of these standard functions, Scarab provides an unlimited number of fully configurable modules (your projects), of artefact types (Defect, Improvement request, Requirements,...), of Attributes (Operating system, Status, Priority, etc.), of Attribute options (P1, P2, P3) that can all be defined on a per-module basis, so that any module can be configured for specific needs..</para>
</listitem>
<listitem>
- <para>Import/Export interface via XML : allows an easy migration from other tracking systems (e.g. Bugzilla).</para>
+ <para>Import/Export interface via XML: allows an easy migration from other tracking systems (e.g. Bugzilla).</para>
</listitem>
<listitem>
<para>Modular code design: allows manageable modifications of existing and new features over time.</para>
</listitem>
<listitem>
- <para>Integrated customization UI : Scarab is fully customizable through a set of administrative pages.</para>
+ <para>Integrated customization UI: Scarab is fully customizable through a set of administrative pages.</para>
</listitem>
<listitem>
<para>Easily modifiable UI look and feel.</para>
</listitem>
<listitem>
- <para>Integration :Scarab can be integrated into larger systems by re-implementing key interfaces.</para>
+ <para>Integration: Scarab can be integrated into larger systems by re-implementing key interfaces.</para>
</listitem>
<listitem>
- <para>Based on application server technologies :Scarab is built using Java Servlet technology for speed, scalability, maintainability, and ease of installation.</para>
+ <para>Based on application server technologies, Scarab is built using Java Servlet technology for speed, scalability, maintainability, and ease of installation.</para>
</listitem>
</itemizedlist>
</sect1>
Modified: trunk/www/book/issues-en.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/book/issues-en.xml?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/www/book/issues-en.xml (original)
+++ trunk/www/book/issues-en.xml 2012-04-26 02:02:34-0700
@@ -2,23 +2,23 @@
<chapter>
<!-- Source: ##UserIssues section of the online help -->
<title>Entering and managing issues</title>
- <para>Scarab has a very dynamic issue management strategy. Committing, tracking and modifying issues is a simple process. Scarab has the following issue management features :</para>
+ <para>Scarab has a very dynamic issue management strategy. Committing, tracking and modifying issues is a simple process. Scarab has the following issue management features:</para>
<itemizedlist>
<listitem>
<para>
- <emphasis role="bold">Relations :</emphasis> Scarab can track relationships between issues. Dependencies between issues can be flagged and tracked through either the issue entry process or while reviewing one or multiple issues. </para>
+ <emphasis role="bold">Relations:</emphasis> Scarab can track relationships between issues. Dependencies between issues can be flagged and tracked through either the issue entry process or while reviewing one or multiple issues. </para>
</listitem>
<listitem>
<para>
- <emphasis role="bold">Change tracking :</emphasis> All changes made along with information about the user who made the change, when the change was made and any comments committed along with the change are tracked with the issue.</para>
+ <emphasis role="bold">Change tracking:</emphasis> All changes made along with information about the user who made the change, when the change was made and any comments committed along with the change are tracked with the issue.</para>
</listitem>
<listitem>
<para>
- <emphasis role="bold">Comment viewing and editing: :</emphasis> All comments made to the issue are tracked. Comments allow support or other type conversations to be viewable and editable by any parties interested in the progress of an issue. </para>
+ <emphasis role="bold">Comment viewing and editing:</emphasis> All comments made to the issue are tracked. Comments allow support or other type conversations to be viewable and editable by any parties interested in the progress of an issue. </para>
</listitem>
<listitem>
<para>
- <emphasis role="bold">Save frequently entered information: :</emphasis> The issue entry template feature allows you to create a frequently used set of data points for attributes in a template. When a template is used, the issue entry form is pre-populated and the user can alter information as needed.</para>
+ <emphasis role="bold">Save frequently entered information:</emphasis> The issue entry template feature allows you to create a frequently used set of data points for attributes in a template. When a template is used, the issue entry form is pre-populated and the user can alter information as needed.</para>
</listitem>
</itemizedlist>
<sect1>
Modified: trunk/www/book/maven-en.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/book/maven-en.xml?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/www/book/maven-en.xml (original)
+++ trunk/www/book/maven-en.xml 2012-04-26 02:02:34-0700
@@ -2,13 +2,12 @@
<chapter>
<title>Maven</title>
<abstract>
- <simpara>Though Scarab end-users are more likely to use Ant to build Scarab, as a developer you will need Maven to access all development functionalities, among which documentation generation.</simpara>
+ <simpara>You will need Maven to access all development functionalities, among which documentation generation.</simpara>
</abstract>
<sect1>
- <title>Maven 1</title>
- <simpara>Though Maven 2 is getting momentum and has officially become the mainstream version at the end of 2005, Scarab still uses Maven 1.</simpara>
- <simpara>Maven 1 and Maven 2 are functionnally equivalent but they are not syntactically compatible and use different build files.</simpara>
- <para>So you will need to install Maven 1 and refer to the Maven 1 documentation at this URL: <ulink url="http://maven.apache.org/maven-1.x/">http://maven.apache.org/maven-1.x/</ulink>
+ <title>Maven 3</title>
+ <simpara>You can use Maven 2 instead of Maven 3, too, but the build will not be fully functional.</simpara>
+ <para>So you will need to install Maven 3 (3.0.3 or later) from this URL: <ulink url="http://http://maven.apache.org">http://http://maven.apache.org</ulink>
</para>
</sect1>
<sect1>
@@ -17,14 +16,14 @@
<title>Normal (full) build</title>
<simpara>Go to the <computeroutput>$SCARAB_ROOT</computeroutput> directory.</simpara>
<simpara>Launch Maven:</simpara>
- <simpara>maven war<computeroutput/>
+ <simpara>mvn clean package<computeroutput/>
</simpara>
</sect2>
<sect2>
<title>Quick build</title>
<simpara>Go to the <computeroutput>$SCARAB_ROOT</computeroutput> directory.</simpara>
<simpara>Launch Maven:</simpara>
- <simpara>maven war -Dmaven.test.skip<computeroutput/>
+ <simpara>mvn clean package -Dmaven.test.skip<computeroutput/>
</simpara>
<simpara>
<computeroutput>-Dmaven.test.skip</computeroutput> skips the execution of unit tests.
@@ -35,7 +34,7 @@
<title>Running the tests</title>
<simpara>Just launch:</simpara>
<simpara>
- <computeroutput>maven test</computeroutput>
+ <computeroutput>mvn clean test</computeroutput>
</simpara>
<simpara>The results of the tests will be in <computeroutput>$(SCARAB_HOME)/target/test-results/</computeroutput>
</simpara>
@@ -43,19 +42,16 @@
<orderedlist>
<listitem>
<simpara>
- <computeroutput>maven clean</computeroutput> (you better start from scratch if you gonna test)</simpara>
+ <computeroutput>mvn clean</computeroutput> (you better start from scratch if you gonna test)</simpara>
</listitem>
<listitem>
<simpara>Configure your <computeroutput>build.properties</computeroutput> to contain at least the correct <computeroutput>scarab.database.type</computeroutput> value.</simpara>
</listitem>
<listitem>
- <simpara>maven war</simpara>
+ <simpara>mvn scarab:create-db (make sure you choose the same database than before!!)</simpara>
</listitem>
<listitem>
- <simpara>maven scarab:create-db (make sure you choose the same database than before!!)</simpara>
- </listitem>
- <listitem>
- <simpara>maven test</simpara>
+ <simpara>mvn test</simpara>
</listitem>
</orderedlist>
</sect2>
Modified: trunk/www/book/scarab-admin-en.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/book/scarab-admin-en.xml?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/www/book/scarab-admin-en.xml (original)
+++ trunk/www/book/scarab-admin-en.xml 2012-04-26 02:02:34-0700
@@ -9,7 +9,7 @@
<book>
<bookinfo>
<title>Scarab - Administration Guide</title>
- <subtitle>Scarab for sysadmin's</subtitle>
+ <subtitle>Scarab for sysadmin's</subtitle>
<corpauthor>The Scarab Development Team</corpauthor>
<editor>
<firstname>Jean-François</firstname>
Modified: trunk/www/book/scarab-dev-en.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/book/scarab-dev-en.xml?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/www/book/scarab-dev-en.xml (original)
+++ trunk/www/book/scarab-dev-en.xml 2012-04-26 02:02:34-0700
@@ -2,7 +2,6 @@
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
<!ENTITY architecture SYSTEM "architecture-en.xml">
- <!ENTITY ant SYSTEM "ant-en.xml">
<!ENTITY maven SYSTEM "maven-en.xml">
<!ENTITY eclipse SYSTEM "eclipse-en.xml">
<!ENTITY netbeans SYSTEM "netbeans-en.xml">
@@ -13,7 +12,7 @@
<!-- $Id -->
<book>
<bookinfo>
- <title>Scarab - Developer's Guide</title>
+ <title>Scarab - Developer's Guide</title>
<subtitle>Scarab for Scarab developers</subtitle>
<corpauthor>The Scarab Development Team</corpauthor>
<editor>
@@ -22,7 +21,6 @@
</editor>
</bookinfo>
&architecture;
- &ant;
&maven;
&eclipse;
&netbeans;
Modified: trunk/www/book/scarab-user-en.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/book/scarab-user-en.xml?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/www/book/scarab-user-en.xml (original)
+++ trunk/www/book/scarab-user-en.xml 2012-04-26 02:02:34-0700
@@ -18,7 +18,7 @@
<!-- $Id -->
<book>
<bookinfo>
- <title>Scarab - User's Guide</title>
+ <title>Scarab - User's Guide</title>
<subtitle>Scarab for mere mortals</subtitle>
<corpauthor>The Scarab Development Team</corpauthor>
<editor>
Modified: trunk/www/book/workflow1-en.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/book/workflow1-en.xml?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/www/book/workflow1-en.xml (original)
+++ trunk/www/book/workflow1-en.xml 2012-04-26 02:02:34-0700
@@ -4,10 +4,10 @@
<sect1>
<title>Introduction</title>
<simpara>Workflow has been a widely debated concept for the life of Scarab. In the lighter part of what's been called "workflow" there is the enforcement of certain conditions on the issues, based on the value of its attributes, its so called "state", or other conditions. In a deeper understanding of the term, workflow deals with the integration between the Scarab actions and other systems/processes.</simpara>
- <simpara>Scarab supports <emphasis>pluggable workflows</emphasis>. Until the milestone 19, the default workflow was not to have one. In fact there was a default workflow that did nothing and allowed all transitions. From milestone 20 upwards, the default option is to use a simple workflow called 'BasicWorkflow'; the behaviour of this workflow is explained below.</simpara>
+ <simpara>Scarab supports <emphasis>pluggable workflows</emphasis>. Until the milestone 19, the default workflow was not to have one. In fact there was a default workflow that did nothing and allowed all transitions. From milestone 20 upwards, the default option is to use a simple workflow called 'BasicWorkflow'; the behaviour of this workflow is explained below.</simpara>
<note>
<title>Changing workflow</title>
- <simpara>If you want to change workflow to use another one or design your own, read the <emphasis>Workflow</emphasis> chapter in the <emphasis>Scarab Developer's Guide</emphasis>.</simpara>
+ <simpara>If you want to change workflow to use another one or design your own, read the <emphasis>Workflow</emphasis> chapter in the <emphasis>Scarab Developer's Guide</emphasis>.</simpara>
</note>
</sect1>
<sect1>
Modified: trunk/www/book/workflow2-en.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/book/workflow2-en.xml?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/www/book/workflow2-en.xml (original)
+++ trunk/www/book/workflow2-en.xml 2012-04-26 02:02:34-0700
@@ -2,7 +2,7 @@
<title>Workflow</title>
<sect1>
<title>Introduction</title>
- <simpara>As has been said in the <emphasis>Workflow</emphasis> chapter of the <emphasis>Scarab User's Guide</emphasis>, Scarab has no "hard-coded" workflow. When saving issues, all state transitions are allowed and there is no interaction with any external system ever.</simpara>
+ <simpara>As has been said in the <emphasis>Workflow</emphasis> chapter of the <emphasis>Scarab User's Guide</emphasis>, Scarab has no "hard-coded" workflow. When saving issues, all state transitions are allowed and there is no interaction with any external system ever.</simpara>
<simpara>Now let's have a look at how this is implemented.</simpara>
</sect1>
<sect1>
@@ -25,7 +25,7 @@
</sect1>
<sect1>
<title>BasicWorkflow</title>
- <simpara>This is the default workflow for all Scarab versions from milestone 20. The way it works from the user point of view is explained in the <emphasis>User's Guide</emphasis>.</simpara>
+ <simpara>This is the default workflow for all Scarab versions from milestone 20. The way it works from the user point of view is explained in the <emphasis>User's Guide</emphasis>.</simpara>
<simpara>This workflow is implemented in the <computeroutput>org.tigris.scarab.workflow.CheapWorkflow</computeroutput> class (againts the odds). It implements the <emphasis>Workflow</emphasis> interface indirectly by inheriting from the default workflow, <computeroutput>DefaultWorkflow</computeroutput> probably not to redefine certain default behaviours.</simpara>
</sect1>
<sect1>
Modified: trunk/www/book/xml-rpc-en.xml
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/book/xml-rpc-en.xml?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/www/book/xml-rpc-en.xml (original)
+++ trunk/www/book/xml-rpc-en.xml 2012-04-26 02:02:34-0700
@@ -5,7 +5,7 @@
<simpara>An example is supplied in the Scarab sources (under <computeroutput>src/java</computeroutput>):</simpara>
<itemizedlist>
<listitem>
- <simpara>la classe <computeroutput>org.tigris.scarab.util.SimpleHandler.java</computeroutput> (server, in Scarab) is used by the Scarab-Subversion integration (read the corresponding chapter in the <emphasis>Scarab User's Guide</emphasis>);</simpara>
+ <simpara>la classe <computeroutput>org.tigris.scarab.util.SimpleHandler.java</computeroutput> (server, in Scarab) is used by the Scarab-Subversion integration (read the corresponding chapter in the <emphasis>Scarab User's Guide</emphasis>);</simpara>
</listitem>
<listitem>
<simpara>la classe <computeroutput>org.tigris.scarab.util.SimpleHandlerClient.java</computeroutput> (client, in another application) is a simple example of using the server above.</simpara>
Modified: trunk/www/repository/README.txt
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/repository/README.txt?view=diff&pathrev=11191&r1=11190&r2=11191
==============================================================================
--- trunk/www/repository/README.txt (original)
+++ trunk/www/repository/README.txt 2012-04-26 02:02:34-0700
@@ -10,236 +10,30 @@
--------------------------------------------------------------------------
-CORE LIBRARIES
+LIBRARIES
==============
These libraries are critical to the basic Scarab functionality and are
-required no matter what optional services you use. Many of the JAR files
-are included as a result of one JAR depending on another JAR for
-functionality. In nearly every case, we attempt to focus our development
-to only rely on Share.whichever.com, Sun and Jakarta Apache JAR files
-because these projects are well known to the open source community and
-considered 'standard' and well supported in our community circles.
-
-* activation-*.jar
-
- JavaBeans Activation Framework. Required by JavaMail. Part of Java
- 2 Enterprise Edition.
-
- http://java.sun.com/products/javabeans/glasgow/jaf.html
-
-* commons-beanutils.jar
-
- Dynamic access to Java object properties.
-
- http://jakarta.apache.org/commons/beanutils.html
-
-* commons-betwixt.jar
-
- Utility that makes Digester useful
-
- http://jakarta.apache.org/commons/betwixt/
-
-* commons-collections.jar
-
- There are certain holes left unfilled by Sun's implementations of
- Collections, and the Jakarta-Commons Collections Component strives to
- fulfill them.
-
- http://jakarta.apache.org/commons/collections.html
-
-* commons-digester*.jar
-
- The Digester package lets you configure an XML -> Java object mapping
- module, which triggers certain actions called rules whenever a
- particular pattern of nested XML elements is recognized.
-
- http://jakarta.apache.org/commons/digester.html
-
-* commons-email*.jar
-
- A thin wrapper around JavaMail to make it easier to use.
-
- http://cvs.apache.org/viewcvs.cgi/jakarta-commons-sandbox/email/
-
-* commons-util*.jar
-
- Re-usable utility code.
-
- http://cvs.apache.org/viewcvs.cgi/jakarta-commons-sandbox/util/
-
-* commons-http*.jar
-
- Re-usable http utility code. (Used in turbine.)
-
- http://cvs.apache.org/viewcvs.cgi/jakarta-commons-sandbox/http/
-
-* commons-io*.jar
-
- Re-usable io utility code. (Used in stratum.)
-
- http://cvs.apache.org/viewcvs.cgi/jakarta-commons-sandbox/io/
-
-* commons-codec*.jar
-
- Re-usable codec utility code. (Used in fulcrum.)
-
- http://cvs.apache.org/viewcvs.cgi/jakarta-commons-sandbox/util/
-
-* dom4j*.jar
-
- dom4j is an easy to use, open source library for working with XML,
- XPath and XSLT on the Java platform using the Java Collections
- Framework and with full support for DOM, SAX and JAXP.
-
- http://www.dom4j.org/
-
-* dnsjava.jar
-
- This is a great DNS package implemented in Java. We optionally
- use it in the registration area to check to see if an email address
- has a valid A record for the domain.
-
- http://www.xbill.org/dnsjava/
-
-* flux*.jar
-
- We are phasing this one out. It is a webapp built for Turbine
- that allows one to manage users/roles/permissions.
-
- http://jakarta.apache.org/turbine/
+required additionally to official Maven respositories.
* fulcrum*.jar
Singleton Services framework. Part of the Jakarta Turbine Project.
+ Some parts of it were patched for Scarab. This is why you get it
+ partially from here.
http://jakarta.apache.org/turbine/
-* jakarta-oro*.jar
-
- heavyweight regex package
-
- http://jakarta.apache.org/oro/
-
-* jakarta-regexp*.jar
-
- lightweight regex package
-
- http://jakarta.apache.org/regexp/
-
-* JavaGroups-2.0.jar
-
- group communication toolkit based on IP multicast, used by JCS (cache)
-
- http://javagroups.sourceforge.net/
-
-* jdbc2_0-stdext.jar
-
- JDBC 2.0 Extension API.
-
- http://java.sun.com/products/jdbc/
-
-* junit*.jar
-
- Java Unit Testing. Used for our testing framework.
-
- http://www.junit.org/
-
-* log4j-1.1.jar
-
- Log4J. Most Excellent Logging package.
-
- http://jakarta.apache.org/log4j/
-
-* lucene*.jar
-
- Java Search Engine
-
- http://jakarta.apache.org/lucene/
-
-* mail-*.jar
-
- JavaMail. Used for sending email from Java.
-
- http://java.sun.com/products/javamail/index.html
-
-* servlet-*.jar
-
- This is the Servlet API 2.2 or greater. We include version 2.2 of the
- Servlet API with Turbine for building purposes. It is however
- recommended that you use the Servlet API that came with your Servlet
- Engine for deployment though.
-
- http://jakarta.apache.org/
-
-* stratum*.jar
-
- Turbine dependency
-
- http://jakarta.apache.org/turbine/
-
-* torque*.zip
-
- Torque is our object relational tool for talking to the database. This
- .zip file includes the entire Torque distribution, including a
- torque.jar. This project is part of the Turbine project.
-
- http://jakarta.apache.org/turbine/
-
* turbine*.jar
- Turbine 3 is our webapp framework.
+ Turbine 3 is our webapp framework. This was patched for Scarab.
http://jakarta.apache.org/turbine/
-* velocity-*.jar
-
- A templating engine that will soon replace WebMacro.
-
- http://jakarta.apache.org/velocity/
-
-* village-*.jar
-
- A Java interface to databases via JDBC drivers.
-
- http://share.whichever.com/village/
-
-* xalan*.jar
-
- XSLT stylesheet transformation
-
- http://xml.apache.org/xalan-j/
-
-* xerces*.jar
-
- XML parser
-
- http://xml.apache.org/xerces-j/
+ * jndi*.jar
+
+ jndi 1.2.1 can't be found in official repositories because of its license,
+ but you may need this dependency as well. Download it from:
-
-DATABASE JDBC DRIVERS
-=====================
-
-* mm.mysql-*.jar
-
- MM MySQL JDBC Driver
-
- http://mmmysql.sourceforge.net/
-
-* postgresql-*.jar
-
- Postgresql JDBC Driver
-
- http://jdbc.postgresql.org/download.html
-
-
-BUILD TOOLS
-===========
-These libraries are used when building Scarab. These are not necessary
-for the operation of Scarab itself.
-
-* ant-*.jar (in ../build)
-
- Java build tool.
-
- http://jakarta.apache.org/ant/
+ http://java.sun.com/products/jndi/downloads/
+
Removed: trunk/www/repository/fulcrum/jars/fulcrum-cache-1.0.5.jar
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/repository/fulcrum/jars/fulcrum-cache-1.0.5.jar?view=markup&pathrev=11190
Removed: trunk/www/repository/fulcrum/jars/fulcrum-factory-1.0.3.jar
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/repository/fulcrum/jars/fulcrum-factory-1.0.3.jar?view=markup&pathrev=11190
Removed: trunk/www/repository/fulcrum/jars/fulcrum-localization-1.0.5.jar
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/repository/fulcrum/jars/fulcrum-localization-1.0.5.jar?view=markup&pathrev=11190
Removed: trunk/www/repository/fulcrum/jars/fulcrum-mimetype-1.0.4.jar
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/repository/fulcrum/jars/fulcrum-mimetype-1.0.4.jar?view=markup&pathrev=11190
Removed: trunk/www/repository/fulcrum/jars/fulcrum-pool-1.0.3.jar
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/repository/fulcrum/jars/fulcrum-pool-1.0.3.jar?view=markup&pathrev=11190
Removed: trunk/www/repository/fulcrum/jars/fulcrum-quartz-1.0.jar
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/repository/fulcrum/jars/fulcrum-quartz-1.0.jar?view=markup&pathrev=11190
Removed: trunk/www/repository/fulcrum/jars/fulcrum-testcontainer-1.0.4.jar
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/repository/fulcrum/jars/fulcrum-testcontainer-1.0.4.jar?view=markup&pathrev=11190
Removed: trunk/www/repository/fulcrum/jars/fulcrum-upload-1.0.3.jar
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/repository/fulcrum/jars/fulcrum-upload-1.0.3.jar?view=markup&pathrev=11190
Removed: trunk/www/repository/fulcrum/jars/fulcrum-xmlrpc-1.0.5.jar
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/repository/fulcrum/jars/fulcrum-xmlrpc-1.0.5.jar?view=markup&pathrev=11190
Removed: trunk/www/repository/fulcrum/jars/fulcrum-yaafi-1.0.3.jar
Url: http://scarab.tigris.org/source/browse/scarab/trunk/www/repository/fulcrum/jars/fulcrum-yaafi-1.0.3.jar?view=markup&pathrev=11190
------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2953026