maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From khmarba...@apache.org
Subject svn commit: r1743830 - /maven/site/trunk/content/apt/guides/introduction/introduction-to-the-standard-directory-layout.apt
Date Sat, 14 May 2016 14:05:22 GMT
Author: khmarbaise
Date: Sat May 14 14:05:21 2016
New Revision: 1743830

URL: http://svn.apache.org/viewvc?rev=1743830&view=rev
Log:
[MNG-2478] 
 o Added the new filtered-resources folder for main/tests
   according to the above change. This should be adopted
   as best practice. Currently the projects can define this
   in a corporate parent pom. After upgrade to Maven 3.4.0
   this configuration can be removed cause it's inherited from
   super pom. 
 o Removed information about maven.xml, build.xml and Ant.

Modified:
    maven/site/trunk/content/apt/guides/introduction/introduction-to-the-standard-directory-layout.apt

Modified: maven/site/trunk/content/apt/guides/introduction/introduction-to-the-standard-directory-layout.apt
URL: http://svn.apache.org/viewvc/maven/site/trunk/content/apt/guides/introduction/introduction-to-the-standard-directory-layout.apt?rev=1743830&r1=1743829&r2=1743830&view=diff
==============================================================================
--- maven/site/trunk/content/apt/guides/introduction/introduction-to-the-standard-directory-layout.apt
(original)
+++ maven/site/trunk/content/apt/guides/introduction/introduction-to-the-standard-directory-layout.apt
Sat May 14 14:05:21 2016
@@ -35,41 +35,47 @@ Introduction to the Standard Directory L
  Maven. Please try to conform to this structure as much as possible; however, if you can't
these settings can
  be overridden via the project descriptor.
 
-*--------------------------------+-----------------------------------------------+
-| <<<src/main/java>>>            | Application/Library sources
-*--------------------------------+-----------------------------------------------+
-| <<<src/main/resources>>>       | Application/Library resources
-*--------------------------------+-----------------------------------------------+
-| <<<src/main/filters>>>         | Resource filter files
-*--------------------------------+-----------------------------------------------+
-| <<<src/main/webapp>>>          | Web application sources
-*--------------------------------+-----------------------------------------------+
-| <<<src/test/java>>>            | Test sources
-*--------------------------------+-----------------------------------------------+
-| <<<src/test/resources>>>       | Test resources
-*--------------------------------+-----------------------------------------------+
-| <<<src/test/filters>>>         | Test resource filter files
-*--------------------------------+-----------------------------------------------+
-| <<<src/it>>>                   | Integration Tests (primarily for plugins)
-*--------------------------------+-----------------------------------------------+
-| <<<src/assembly>>>             | Assembly descriptors
-*--------------------------------+-----------------------------------------------+
-| <<<src/site>>>                 | Site
-*--------------------------------+-----------------------------------------------+
-| <<<LICENSE.txt>>>              | Project's license
-*--------------------------------+-----------------------------------------------+
-| <<<NOTICE.txt>>>               | Notices and attributions required by
libraries that the project depends on
-*--------------------------------+-----------------------------------------------+
-| <<<README.txt>>>               | Project's readme
-*--------------------------------+-----------------------------------------------+
+*-----------------------------------+-----------------------------------------------+
+| <<<src/main/java>>>               | Application/Library sources
+*-----------------------------------+-----------------------------------------------+
+| <<<src/main/resources>>>          | Application/Library resources
+*-----------------------------------+-----------------------------------------------+
+| <<<src/main/filtered-resources>>> | Application/Library resources which
are filtered. 
+|                                   | (Starting with Maven 3.4.0 not yet released.)
+*-----------------------------------+-----------------------------------------------+
+| <<<src/main/filters>>>            | Resource filter files
+*-----------------------------------+-----------------------------------------------+
+| <<<src/main/webapp>>>             | Web application sources
+*-----------------------------------+-----------------------------------------------+
+| <<<src/test/java>>>               | Test sources
+*-----------------------------------+-----------------------------------------------+
+| <<<src/test/resources>>>          | Test resources
+*-----------------------------------+-----------------------------------------------+
+| <<<src/test/filtered-resources>>> | Test resources which are filtered
by default.
+|                                   | (Starting with Maven 3.4.0 not yet released.)
+*-----------------------------------+-----------------------------------------------+
+| <<<src/test/filters>>>            | Test resource filter files
+*-----------------------------------+-----------------------------------------------+
+| <<<src/it>>>                      | Integration Tests (primarily for
plugins)
+*-----------------------------------+-----------------------------------------------+
+| <<<src/assembly>>>                | Assembly descriptors
+*-----------------------------------+-----------------------------------------------+
+| <<<src/site>>>                    | Site
+*-----------------------------------+-----------------------------------------------+
+| <<<LICENSE.txt>>>                 | Project's license
+*-----------------------------------+-----------------------------------------------+
+| <<<NOTICE.txt>>>                  | Notices and attributions required
by libraries that the project depends on
+*-----------------------------------+-----------------------------------------------+
+| <<<README.txt>>>                  | Project's readme
+*-----------------------------------+-----------------------------------------------+
 
- At the top level files descriptive of the project: a <<<pom.xml>>> file
(and any properties,
- <<<maven.xml>>> or <<<build.xml>>> if using Ant). In
addition, there are textual documents meant
- for the user to be able to read immediately on receiving the source: <<<README.txt>>>,
- <<<LICENSE.txt>>>, etc.
+
+ At the top level files descriptive of the project: a <<<pom.xml>>> file

+ In addition, there are textual documents meant for the user to be able to 
+ read immediately on receiving the source: <<<README.txt>>>, <<<LICENSE.txt>>>,
etc.
 
  There are just two subdirectories of this structure: <<<src>>> and <<<target>>>.
The only other
- directories that would be expected here are metadata like <<<CVS>>> or
<<<.svn>>>, and any
+ directories that would be expected here are metadata like <<<CVS>>>, <<<.git>>>
or <<<.svn>>>, and any
  subprojects in a multiproject build (each of which would be laid out as above).
 
  The <<<target>>> directory is used to house all output of the build.



Mime
View raw message