werken 2002/06/26 13:47:08
Modified: src/java/org/apache/maven/app Maven.java
Added: src/templates/build/plugins/core plugin.properties
Log:
Plugins go looking for plugin.properties now, instead of default.properties
(ng-only)
Revision Changes Path
1.23 +1 -1 jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java
Index: Maven.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Maven.java 26 Jun 2002 19:51:52 -0000 1.22
+++ Maven.java 26 Jun 2002 20:47:08 -0000 1.23
@@ -130,7 +130,7 @@
public static final String PLUGIN_SCRIPT_NAME = "plugin.jelly";
/** Plug-in default properties name. */
- public static final String PLUGIN_PROPERTIES_NAME = "default.properties";
+ public static final String PLUGIN_PROPERTIES_NAME = "plugin.properties";
// ------------------------------------------------------------
// Class members
1.1
jakarta-turbine-maven/src/templates/build/plugins/core/plugin.properties
Index: plugin.properties
===================================================================
# -------------------------------------------------------------------
# D E F A U L T M A V E N P R O P E R T I E S
# -------------------------------------------------------------------
# These are the properties that we believe are immutable so we
# keep them apart from the project specific properties.
# -------------------------------------------------------------------
maven.src.dir = ${basedir}/src
maven.conf.dir = ${basedir}/conf
maven.build.dir = ${basedir}/target
maven.build.src = ${maven.build.dir}/src
maven.build.dest = ${maven.build.dir}/classes
maven.compile.aspects = false
maven.compile.debug = on
maven.compile.optimize = off
maven.compile.deprecation = off
maven.jar.aspectjrt = ${ant.home}/lib/aspectjrt.jar
maven.jar.aspectjtools = ${ant.home}/lib/aspectjtools.jar
maven.jar.excludes = **/package.html
maven.docs.src = ${basedir}/xdocs
maven.docs.dest = ${maven.build.dir}/docs
maven.docs.outputencoding = ISO-8859-1
maven.gen.docs = ${maven.build.dir}/generated-xdocs
maven.repo.remote = http://jakarta.apache.org/turbine/jars/
maven.repo.local = ${lib.repo}
maven.jarResources.basedir=${basedir}
#
# Properties that are used for the integration unit tests
# Defined here so they can easily be overridden by project
# specific properties if necessary.
#
maven.iutest.dir = ${maven.integrationUnitTestSourceDirectory}
maven.out.test.dir = ${maven.build.dir}/iutest
maven.webapp.dir = ${maven.iutest.dir}/testapp
maven.conf.test.dir = ${maven.iutest.dir}/cactus
maven.tomcat.home = ${tdk.home}
maven.test.port = 8192
maven.iutest.dest = ${maven.build.dir}/iutest-classes
#
# properties for unit testing
#
maven.junit.fork = no
maven.junit.dir = ${basedir}
maven.junit.usefile = true
maven.test.dest = ${maven.build.dir}/test-classes
maven.test.reportsDirectory = ${maven.build.dir}/test-reports
#
# These names will actually be based on the versioning document
# that morgan checked into jakarta-site2 the other day.
#
#maven.final.name = ${maven.id}-${maven.currentVersion}
maven.final.name = ${pom.id}-${pom.currentVersion}
maven.final.dir = ${basedir}/${maven.final.name}
#
# Properties for the javadoc generation
#
maven.javadoc.destdir = ${maven.docs.dest}/apidocs
maven.javadoc.windowtitle = ${maven.name} ${maven.currentVersion} API
maven.javadoc.doctitle = ${maven.name} ${maven.currentVersion} API
maven.javadoc.author = true
maven.javadoc.private = false
maven.javadoc.version = true
maven.javadoc.use = true
#
# properties for jxr cross-referencing
#
maven.jxr.destdir = ${maven.docs.dest}/xref
#
# Checkstyle settings ... default maven settings, these can be
# overridden in a project specific properties file.
#
maven.checkstyle.includes = **/*.java
maven.checkstyle.excludes =
maven.checkstyle.properties =
${maven.home}/plugins/core/sun-code-conventions-checkstyle.properties
maven.checkstyle.fail.on.violation = false
maven.checkstyle.cache.file = ${maven.build.dir}/checkstyle-cachefile
#
# UI Color Prefs
#
maven.ui.body.background = #fff
maven.ui.body.foreground = #000
maven.ui.section.background = #036
maven.ui.section.foreground = #fff
maven.ui.subsection.background = #888
maven.ui.subsection.foreground = #fff
maven.ui.table.header.background = #bbb
maven.ui.table.header.foreground = #fff
maven.ui.table.row.odd.background = #ddd
maven.ui.table.row.odd.foreground = #000
maven.ui.table.row.even.background = #efefef
maven.ui.table.row.even.foreground = #000
maven.ui.banner.background = #036
maven.ui.banner.foreground = #fff
maven.ui.banner.border.top = #369
maven.ui.banner.border.bottom = #003
maven.ui.source.background = #fff
maven.ui.source.foreground = #000
maven.ui.source.border.right = #888
maven.ui.source.border.left = #888
maven.ui.source.border.top = #888
maven.ui.source.border.bottom = #888
maven.ui.navcol.background = #eee
maven.ui.navcol.background.ns4 = #fff
maven.ui.navcol.foreground = #000
maven.ui.navcol.foreground.ns4 = #555
maven.ui.navcol.border.top = #fff
maven.ui.navcol.border.right = #aaa
maven.ui.navcol.border.bottom = #aaa
maven.ui.breadcrumbs.background = #ddd
maven.ui.breadcrumbs.foreground = #000
maven.ui.breadcrumbs.border.top = #fff
maven.ui.breadcrumbs.border.bottom = #aaa
maven.ui.href.link = blue
maven.ui.href.link.active = #f30
maven.ui.href.link.selfref = #555
#
# properties for changelog
#
maven.changelog.range = 5
maven.activitylog.range = 30
maven.changelog.factory = org.apache.maven.cvslib.CvsChangeLogFactory
# -------------------------------------------------------------------
# M A V E N U P D A T E S I T E A N D S E L F U P D A T I N G
# -------------------------------------------------------------------
# This needs to be changed before prime time.
maven.updateSite = http://www.apache.org/~jvanzyl/maven/update
# -------------------------------------------------------------------
# M A V E N D I S T R I B U T I O N S
# -------------------------------------------------------------------
maven.distBuildDirectory = ${basedir}/target
maven.distBuildIndicator = DIST_BUILD_DIRECTORY
maven.distDirectory = ${basedir}/dist
# -------------------------------------------------------------------
# E N V I R O N M E N T D E P E N D E N T T O O L S
# -------------------------------------------------------------------
maven.scp.executable = scp
maven.ssh.executable = ssh
# -------------------------------------------------------------------
# Mark the defaults as loaded - PLEASE DON'T OVERRIDE
# -------------------------------------------------------------------
maven.defaults.loaded = true
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
