You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by fg...@apache.org on 2005/10/09 18:51:21 UTC
svn commit: r310226 [2/2] - in /maven/maven-1/plugins/trunk/eclipse: ./
src/plugin-resources/templates/ src/plugin-test/duplicatebuilderstest/
src/plugin-test/duplicatebuilderstest/src/
src/plugin-test/duplicatebuilderstest/src/main/ src/plugin-test/ju...
Propchange: maven/maven-1/plugins/trunk/eclipse/src/plugin-test/wtptest/src/resources/dir.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/maven-1/plugins/trunk/eclipse/src/plugin-test/wtptest/src/resources/dir.txt
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/maven-1/plugins/trunk/eclipse/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/eclipse/xdocs/changes.xml?rev=310226&r1=310225&r2=310226&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/eclipse/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/eclipse/xdocs/changes.xml Sun Oct 9 09:50:48 2005
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,13 +24,27 @@
<author email="dion@multitask.com.au">dIon Gillard</author>
</properties>
<body>
- <release version="1.10" date="IN CVS">
+ <release version="1.10" date="IN SVN">
<action dev="carlos" type="fix">Moved test classpath before main so test classpath resources override main ones</action>
<action dev="epugh" type="fix" issue="MPECLIPSE-68">eclipse:add-maven-repo doesn't update correct Eclipse property file for Eclipse 3.x</action>
<action dev="epugh" type="fix" issue="MPECLIPSE-67">add-maven-repo fails if Eclipse hasn't been started yet. Property file needs to be created
- by the plugin.</action>
+ by the plugin.
+ </action>
<action dev="epugh" type="fix" issue="MPECLIPSE-56" due-to="Archimedes Trajano">Only create .classpath and javabuilder if sources are present</action>
- </release>
+ <action dev="fgiust" type="fix" issue="MPECLIPSE-78" due-to="Fabrizio Giustina">Don't add duplicate java natures/builders if already specified using
+ <code>maven.eclipse.projectnatures</code> and <code>maven.eclipse.buildcommands</code>
+ </action>
+ <action dev="fgiust" type="fix" issue="MPECLIPSE-63" due-to="Fabrizio Giustina">Only add javanature if sources are present</action>
+ <action dev="fgiust" type="add" issue="MPECLIPSE-80" due-to="Fabrizio Giustina">Generates a .wtpmodules file for eclipse webtools (wtp 0.7 required)</action>
+ <action dev="fgiust" type="fix" issue="MPECLIPSE-96" due-to="Fabrizio Giustina">classpathentry contains trailing pipe character that confuses Eclipse 3.1</action>
+ <action dev="fgiust" type="update" due-to="Fabrizio Giustina">Java source location now defaults to
+ <code>MAVEN_REPO${groupId}/java-sources/${artifactId}-${version}-sources.jar</code> (standard location where source artifacts are deployed by the m2 source plugin in
+ a legacy/m1 repository layout). The path <code>${groupId}/src/${artifactId}-${version}.${maven.eclipse.src.extension}</code> is still supported for backward compatibility
+ and it will be used only if a file already exists at that location.
+ </action>
+ <action dev="fgiust" type="fix" issue="MPECLIPSE-92" due-to="Yang Li">Setting relative path value to "maven.eclipse.output.dir" generates wrong absolute classpath entry</action>
+ <action dev="fgiust" type="fix" issue="MPECLIPSE-72" due-to="Kristopher Brown">Failing use cases for projects with just resources</action>
+ </release>
<release version="1.9" date="2004-10-30">
<action dev="epugh" type="fix" issue="MPECLIPSE-53">Add property
<code>maven.eclipse.resources.addtoclasspath</code>to control whether to add pom.resources etc or not. Provide backwards compatiblity.
@@ -78,7 +92,7 @@
<release version="1.3" date="Unknown">
<action dev="michal" type="add">Smarter generation of .classpath file. ${basedir} prefix is cut off if present in any path. Default Maven location of source and destination folder are used.</action>
<action dev="evenisse" type="add">Added dependency functionality between projects</action>
- <action dev="bwalding" type="update">Split eclispe goal in two goals : eclipse:generate-project and eclipse:generate-classpath</action>
+ <action dev="bwalding" type="update">Split eclipse goal in two goals : eclipse:generate-project and eclipse:generate-classpath</action>
</release>
<release version="1.2" date="Unknown">
<action dev="dion" type="add">Added more documentation</action>
Modified: maven/maven-1/plugins/trunk/eclipse/xdocs/goals.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/eclipse/xdocs/goals.xml?rev=310226&r1=310225&r2=310226&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/eclipse/xdocs/goals.xml (original)
+++ maven/maven-1/plugins/trunk/eclipse/xdocs/goals.xml Sun Oct 9 09:50:48 2005
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
+<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,19 +29,21 @@
<goal>
<name>eclipse</name>
<description>
- The default goal. This goal simply executes the
+ The default goal. This goal simply executes the
<a href="#eclipse:generate-project">eclipse:generate-project</a> and
<a href="#eclipse:generate-classpath">eclipse:generate-classpath</a> goals.
+ If the <code>maven.multiproject.type</code> is set to <code>war</code> also calls the
+ <a href="#eclipse:generate-wtpmodules">eclipse:generate-wtpmodules</a> goal.
</description>
</goal>
-
+
<goal>
<name>eclipse:clean</name>
<description>
- Deletes the <code>.project</code> and <code>.classpath</code> files.
+ Deletes the <code>.project</code>, <code>.classpath</code> and <code>.wtpmodules</code> files.
</description>
- </goal>
-
+ </goal>
+
<goal>
<name>eclipse:generate-project</name>
<description>
@@ -61,14 +63,22 @@
<li>the JRE being used</li>
<li>the appropriate version of JUnit</li>
<li>each Maven project <code>dependency</code></li>
- <li>an output directory for compiled code:
+ <li>an output directory for compiled code:
<code>target\classes</code>
</li>
<li>any .zip source archives</li>
</ol>
</description>
</goal>
-
+
+ <goal>
+ <name>eclipse:generate-wtpmodules</name>
+ <description>
+ Generates a <code>.wtpmodules</code> file for eclipse wtp marking the project as a j2ee module.
+ Project with the <code>maven.multiproject.type</code> set to <code>war</code> are configured as web modules.
+ </description>
+ </goal>
+
<goal>
<name>eclipse:external-tools</name>
<description>
Modified: maven/maven-1/plugins/trunk/eclipse/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/eclipse/xdocs/index.xml?rev=310226&r1=310225&r2=310226&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/eclipse/xdocs/index.xml (original)
+++ maven/maven-1/plugins/trunk/eclipse/xdocs/index.xml Sun Oct 9 09:50:48 2005
@@ -1,14 +1,14 @@
<?xml version="1.0"?>
-<!--
+<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,7 +32,7 @@
(<code>.classpath</code> and <code>.project</code> files), as well as
configure Eclipse to use Maven as an <i>External Tool</i>.
</p>
- <p>
+ <p>
For more information on the functionality provided by this plugin,
please see the <a href="goals.html">Goals</a> document.
</p>
@@ -42,11 +42,11 @@
document.
</p>
</section>
-
+
<section name="Defining dependencies as eclipse projects">
<p>
- The dependencies defined in the POM need not to be jars strictly. They can
- be projects in the eclipse workspace. If a dependency is an eclipse project
+ The dependencies defined in the POM need not to be jars strictly. They can
+ be projects in the eclipse workspace. If a dependency is an eclipse project
a property needs to be added to that dependency to indicate so.
</p>
<source><![CDATA[
@@ -60,7 +60,7 @@
</dependency>
]]></source>
<p>
- This indicates that the dependency is another project in the workspace.
+ This indicates that the dependency is another project in the workspace.
Note that the name of the referenced project is the artifactId.
</p>
<p>
@@ -74,23 +74,20 @@
Frequently you will want to include for compiled jars the source .java files to help
with debugging.
</p>
- <p>
- The plugin will check if the file specified is located in <code>MAVEN_REPO/${groupId}/src/</code> directory
- and ending in <code>maven.eclipse.src.extension</code> exists and will add it as a source attachment.
- Using default values the dependency <code>MAVEN_REPO/eclipse/<em>jars</em>/eclipse-ui-3.0.0.<em>jar</em></code>
- will be mapped to <code>MAVEN_REPO/eclipse/<em>src</em>/eclipse-ui-3.0.0.<em>zip</em></code>
+ <p>
+ The plugin will check if the file located at <code>MAVEN_REPO${groupId}/java-sources/${artifactId}-${version}-sources.jar</code>
+ exists and will add it as a source attachment.
+ As an example, the source archive for the dependency <code>MAVEN_REPO/eclipse/<em>jars</em>/eclipse-ui-3.0.0<em>.jar</em></code>
+ will be mapped to <code>MAVEN_REPO/eclipse/<em>java-sources</em>/eclipse-ui-3.0.0<em>-sources.jar</em></code>
</p>
<p>
- While this implementation isn't the perfect solution, for example no downloading of
- source .zip files, it is a minimal solution that will work now. Future versions
- of Maven will have more sophisticated solutions for dealing with source code. There is
- no guarantee that this implementation will remain in later versions of Maven and this
- plugin.
+ For backward compatibility the plugin still accepts source archives located at
+ <code>MAVEN_REPO/${groupId}/src/${artifactId}-${version}.${maven.eclipse.src.extension}</code>.
</p>
</subsection>
<subsection name="Generated Source Code">
<p>
- When Eclipse is not generating source code for you there is a conflict between
+ When Eclipse is not generating source code for you there is a conflict between
Maven generating the source code and then Eclipse treating it as compiled code.
Typically when generating code using Maven the code ends up in the target/classes
directory. This is fine as long as Maven is doing the build. However, if Eclipse
@@ -101,15 +98,15 @@
The alternatives typically are to place the generated code in the /src/java directory
and allow Maven and Eclipse to treat it the same. However, this leads to a tendency
to check generated code into source control, which typically is not appropriate for
- generated code. Alternatively, it can be placed in some sort of /src/generated or
- target/generated directory. In Maven2, generated code lives in target/generated-sources,
+ generated code. Alternatively, it can be placed in some sort of /src/generated or
+ target/generated directory. In Maven2, generated code lives in target/generated-sources,
in a manner similiar to generated xdoc's live in target/generated-xdocs. Within the
- target/generated-sources would be each type of generated code.
+ target/generated-sources would be each type of generated code.
</p>
<p>
By default, the plugin will load as seperate source folders any directory found in
<code>${maven.build.dir}/generated-sources</code>. So, if you generate your mock objects into
- <code>${maven.build.dir}/generated-sources/mocks</code> and your wsdl classes into
+ <code>${maven.build.dir}/generated-sources/mocks</code> and your wsdl classes into
<code>${maven.build.dir}/generated-sources/wsdl</code> then each of these directories will be mounted
as source folders. Note: You must have already created these directories, otherwise the
plugin won't know to add them as source folders. Before running <code>maven eclipse</code>
@@ -117,7 +114,7 @@
</p>
<p>
For example, if you used the XDoclet Plugin for Maven to generate Hibernate mapping files,
- they would be placed in <code>/target/generated-sources/xdoclet/</code>. While, if you used the
+ they would be placed in <code>/target/generated-sources/xdoclet/</code>. While, if you used the
Hibernate Plugin for Maven to generate the SQL scripts for generating a database then that
would be placed in <code>/target/generated-sources/schema/</code>.
<br/>
@@ -128,6 +125,6 @@
maven.hibernate.output.dir=${maven.build.dir}/generated-sources/schema
</source>
</subsection>
- </section>
+ </section>
</body>
</document>
Modified: maven/maven-1/plugins/trunk/eclipse/xdocs/properties.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/eclipse/xdocs/properties.xml?rev=310226&r1=310225&r2=310226&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/eclipse/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/eclipse/xdocs/properties.xml Sun Oct 9 09:50:48 2005
@@ -1,14 +1,14 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
+<!--
/*
* Copyright 2001-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -38,7 +38,7 @@
<p>
On Windows, this will be the <code>workspace</code> directory
under your eclipse installation. For example, if you installed
- eclipse into <code>c:\eclipse</code>, the workspace is
+ eclipse into <code>c:\eclipse</code>, the workspace is
<code>c:\eclipse\workspace</code>.
</p>
<p>
@@ -52,7 +52,7 @@
<td>Yes (default=3.8.1)</td>
<td>
The version of JUnit you want added to your project. If this
- property is set to <code>none</code> then JUnit will not be added to your
+ property is set to <code>none</code> then JUnit will not be added to your
build classpath.
</td>
</tr>
@@ -77,7 +77,7 @@
<td>maven.eclipse.classpath.include</td>
<td>Yes</td>
<td>
- Comma delimited list of additional source directories to include in
+ Comma delimited list of additional source directories to include in
the classpath, like <code>src/conf</code>.
</td>
</tr>
@@ -88,13 +88,13 @@
Specify whether to include the resources defined in the POM in the
Eclipse classpath. Defaults to false.
</td>
- </tr>
+ </tr>
<tr>
<td>maven.eclipse.conclasspath</td>
<td>Yes</td>
<td>
- Comma delimited list of additional kind "con" path
- to include in the classpath description file like
+ Comma delimited list of additional kind "con" path
+ to include in the classpath description file like
<code>org.eclipse.pde.core.requiredPlugins</code>
</td>
</tr>
@@ -102,8 +102,9 @@
<td>maven.eclipse.buildcommands</td>
<td>Yes</td>
<td>
- Comma delimited list of additional build commands
- to include in the project description file.
+ Comma delimited list of additional build commands
+ to include in the project description file. The java builder will automatically be added if a java source
+ dir is set (if not already specified in the list).
</td>
</tr>
<tr>
@@ -112,7 +113,7 @@
<td>
Comma delimited list of additional project natures
to include in the project description file. These natures
- will be added after the java nature.
+ will be added after the java nature (if the java nature is not already specified in the list).
</td>
</tr>
<tr>
@@ -130,14 +131,16 @@
<td>Yes (default=<code>zip</code>)</td>
<td>
The extension used for source attachments.
+ Deprecated, source attachment are expected now at
+ <code>MAVEN_REPO${groupId}/java-sources/${artifactId}-${version}-sources.jar</code>
</td>
</tr>
</table>
<p>
- Note that you will need to defined a <code>MAVEN_REPO</code> Java
+ Note that you will need to defined a <code>MAVEN_REPO</code> Java
Classpath variable in Eclipse. This is done by selecting the Window
menu, then Preferences. In the dialog box, select the Java node and
- then Classpath Variables. Create a new variable named
+ then Classpath Variables. Create a new variable named
<code>MAVEN_REPO</code> that points to your local Maven repository.
</p>
</section>