You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/03/24 19:30:56 UTC
svn commit: r640502 - in /maven/plugins/trunk/maven-eclipse-plugin/src:
main/java/org/apache/maven/plugin/eclipse/
main/java/org/apache/maven/plugin/eclipse/writers/
main/java/org/apache/maven/plugin/eclipse/writers/workspace/
main/java/org/apache/mave...
Author: bentmann
Date: Mon Mar 24 11:30:49 2008
New Revision: 640502
URL: http://svn.apache.org/viewvc?rev=640502&view=rev
Log:
o Added svn:eol-style=native
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/AbstractWorkspaceMojo.java (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/ConfigureWorkspaceMojo.java (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/WorkspaceConfiguration.java (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseManifestWriter.java (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseCodeFormatterProfile.java (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseWorkspaceWriter.java (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/workspace/WorkspaceWriter.java (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpApplicationXMLWriter.java (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/ide/messages.properties (contents, props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/attach-library-sources.apt (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/load-code-styles.apt (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/prevent-module-references.apt (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/provide-project-natures-and-build-commands.apt (contents, props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/site/fml/faq.fml (contents, props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojoTest.java (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseWorkspaceTest.java (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseCodeFormatterTest.java (contents, props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-11/src/main/modello/dummy.mdo (contents, props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-17/pom.xml (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-33/pom.xml (contents, props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/pom.xml (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/src/main/java/DummyClass.txt (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/pom.xml (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/pom.xml (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/src/main/java/DummyClass.txt (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/target/application.xml (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/target/eclipseEar/META-INF/application.xml (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/target/eclipseEar/META-INF/test-file.txt (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/pom.xml (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/src/main/application/META-INF/test-file.txt (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/pom.xml (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/src/main/java/DummyClass.txt (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/pom.xml (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-4/pom.xml (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-4/src/main/resources/DummyResource.txt (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/workspace-01/pom.xml (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/workspace-02/code-styles.xml (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/workspace-02/pom.xml (props changed)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/test-harness/add-maven-repo/min-plugin-config.xml (props changed)
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/AbstractWorkspaceMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/ConfigureWorkspaceMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/WorkspaceConfiguration.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/EclipseManifestWriter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseCodeFormatterProfile.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseWorkspaceWriter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/workspace/WorkspaceWriter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/wtp/EclipseWtpApplicationXMLWriter.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/ide/messages.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/ide/messages.properties?rev=640502&r1=640501&r2=640502&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/ide/messages.properties (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/ide/messages.properties Mon Mar 24 11:30:49 2008
@@ -1,11 +1,11 @@
-sourcesnotavailable=\n Sources for some artifacts are not available.\n List of artifacts without a source archive:
-sourcesnotdownloaded=\n Sources for some artifacts are not available.\n Please run the same goal with the -DdownloadSources=true parameter in order to check remote repositories for sources.\n List of artifacts without a source archive:
-sourcesmissingitem=\n o {0}
-javadocnotavailable=\n Javadoc for some artifacts is not available.\n List of artifacts without a javadoc archive:
-javadocnotdownloaded=\n Javadoc for some artifacts is not available.\n Please run the same goal with the -DdownloadJavadocs=true parameter in order to check remote repositories for javadoc.\n List of artifacts without a javadoc archive:
-javadocmissingitem=\n o {0}
-errorresolving=Error resolving {0} artifact. Artifact id: {1} (Message: {2})
-artifactresolution=An error occurred during dependency resolution of the following artifact:\n {0}:{1}:{2}\nCaused by: {3}
-artifactdownload=An error occurred during dependency resolution.\n Failed to retrieve {0}:{1}-{2}\nCaused by: {3}
-cantcanonicalize=Can''t canonicalize system path: {0}
-unabletoparseversion={0}: unable to parse version ''{1}'' for dependency ''{2}'': {3}
+sourcesnotavailable=\n Sources for some artifacts are not available.\n List of artifacts without a source archive:
+sourcesnotdownloaded=\n Sources for some artifacts are not available.\n Please run the same goal with the -DdownloadSources=true parameter in order to check remote repositories for sources.\n List of artifacts without a source archive:
+sourcesmissingitem=\n o {0}
+javadocnotavailable=\n Javadoc for some artifacts is not available.\n List of artifacts without a javadoc archive:
+javadocnotdownloaded=\n Javadoc for some artifacts is not available.\n Please run the same goal with the -DdownloadJavadocs=true parameter in order to check remote repositories for javadoc.\n List of artifacts without a javadoc archive:
+javadocmissingitem=\n o {0}
+errorresolving=Error resolving {0} artifact. Artifact id: {1} (Message: {2})
+artifactresolution=An error occurred during dependency resolution of the following artifact:\n {0}:{1}:{2}\nCaused by: {3}
+artifactdownload=An error occurred during dependency resolution.\n Failed to retrieve {0}:{1}-{2}\nCaused by: {3}
+cantcanonicalize=Can''t canonicalize system path: {0}
+unabletoparseversion={0}: unable to parse version ''{1}'' for dependency ''{2}'': {3}
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/main/resources/org/apache/maven/plugin/ide/messages.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/attach-library-sources.apt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/load-code-styles.apt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/prevent-module-references.apt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/provide-project-natures-and-build-commands.apt
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/provide-project-natures-and-build-commands.apt?rev=640502&r1=640501&r2=640502&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/provide-project-natures-and-build-commands.apt (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/provide-project-natures-and-build-commands.apt Mon Mar 24 11:30:49 2008
@@ -1,75 +1,75 @@
- ------
- Provide Build Commands
- ------
- Edwin Punzalan
- ------
- 14 July 2006
- ------
-
-
-Provide Project Natures And Build Commands for Eclipse
-
- The default project nature for projects created by the Eclipse Plugin is
- <<<org.eclipse.jdt.core.javanature>>> and the default build command is
- <<<org.eclipse.jdt.core.javabuilder>>>. Additional project natures and build
- commands are also added as needed when WTP is enabled.
-
- If you want to provide additional project natures and build commands for your
- project, i.e. Spring project, you can add them in your pom.xml like this:
-
-+-----
-<project>
- [...]
- <build>
- [...]
- <plugins>
- [...]
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <additionalProjectnatures>
- <projectnature>org.springframework.ide.eclipse.core.springnature</projectnature>
- </additionalProjectnatures>
- <additionalBuildcommands>
- <buildcommand>org.springframework.ide.eclipse.core.springbuilder</buildcommand>
- </additionalBuildcommands>
- </configuration>
- </plugin>
- [...]
- </plugins>
- [...]
- </build>
- [...]
-</project>
-+-----
-
- To provide your own project natures and build commands which will override
- the defaults, you can put them in your pom.xml as follows:
-
-+-----
-<project>
- [...]
- <build>
- [...]
- <plugins>
- [...]
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin<artifactId>
- <configuration>
- <projectnatures>
- <projectnature>my.own.project.nature</projectnature>
- </projectnatures>
- <buildcommands>
- <buildcommand>my.own.build.command</buildcommand>
- </buildcommands>
- </configuration>
- </plugin>
- [...]
- </plugins>
- [...]
- </build>
- [...]
-</project>
-+-----
+ ------
+ Provide Build Commands
+ ------
+ Edwin Punzalan
+ ------
+ 14 July 2006
+ ------
+
+
+Provide Project Natures And Build Commands for Eclipse
+
+ The default project nature for projects created by the Eclipse Plugin is
+ <<<org.eclipse.jdt.core.javanature>>> and the default build command is
+ <<<org.eclipse.jdt.core.javabuilder>>>. Additional project natures and build
+ commands are also added as needed when WTP is enabled.
+
+ If you want to provide additional project natures and build commands for your
+ project, i.e. Spring project, you can add them in your pom.xml like this:
+
++-----
+<project>
+ [...]
+ <build>
+ [...]
+ <plugins>
+ [...]
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <additionalProjectnatures>
+ <projectnature>org.springframework.ide.eclipse.core.springnature</projectnature>
+ </additionalProjectnatures>
+ <additionalBuildcommands>
+ <buildcommand>org.springframework.ide.eclipse.core.springbuilder</buildcommand>
+ </additionalBuildcommands>
+ </configuration>
+ </plugin>
+ [...]
+ </plugins>
+ [...]
+ </build>
+ [...]
+</project>
++-----
+
+ To provide your own project natures and build commands which will override
+ the defaults, you can put them in your pom.xml as follows:
+
++-----
+<project>
+ [...]
+ <build>
+ [...]
+ <plugins>
+ [...]
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin<artifactId>
+ <configuration>
+ <projectnatures>
+ <projectnature>my.own.project.nature</projectnature>
+ </projectnatures>
+ <buildcommands>
+ <buildcommand>my.own.build.command</buildcommand>
+ </buildcommands>
+ </configuration>
+ </plugin>
+ [...]
+ </plugins>
+ [...]
+ </build>
+ [...]
+</project>
++-----
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/examples/provide-project-natures-and-build-commands.apt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/site/apt/index.apt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/site/fml/faq.fml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/site/fml/faq.fml?rev=640502&r1=640501&r2=640502&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/site/fml/faq.fml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/site/fml/faq.fml Mon Mar 24 11:30:49 2008
@@ -1,29 +1,29 @@
-<?xml version="1.0"?>
-<faqs id="FAQ" title="Frequently Asked Questions">
- <part id="General">
- <faq id="eclipse-plugin">
- <question>Is this the Eclipse Plugin that allows me to run maven commands from within Eclipse IDE?</question>
- <answer>
- <p>No. This is a maven plugin to generate Eclipse files for a maven project. This is not an Eclipse Plugin for Maven.</p>
- </answer>
- </faq>
- <faq id="import-project">
- <question>I already did <i>mvn eclipse:eclipse</i> but when I open Eclipse, my project is not there. Where is it?</question>
- <answer>
- <p>You may also need to import the project created by Maven Eclipse Plugin. More information can be found <a href="usage.html#Simple Project">here</a>.</p>
- </answer>
- </faq>
- <faq id="use-add-maven-repo">
- <question>After running <i>mvn eclipse:eclipse</i>, the generated dependencies are pointing to a non-existing file. What needs to be done?</question>
- <answer>
- <p>Before you can setup any maven project to your Eclipse IDE, you need to define first the location of your local repository to Eclipse. This is done by using: <a href="usage.html#Maven%20repository">eclipse:add-maven-repo</a></p>
- </answer>
- </faq>
- <faq id="import-javadoc">
- <question>Can I make the Eclipse plugin download and attach javadocs to my libraries?</question>
- <answer>
- <p>As of version 2.4, there is a new flag, downloadJavadocs that behaves exactly like downloadSources except for javadocs. See more information here: <a href="examples/attach-library-sources.html">Attach Library Sources</a>. </p>
- </answer>
- </faq>
- </part>
-</faqs>
+<?xml version="1.0"?>
+<faqs id="FAQ" title="Frequently Asked Questions">
+ <part id="General">
+ <faq id="eclipse-plugin">
+ <question>Is this the Eclipse Plugin that allows me to run maven commands from within Eclipse IDE?</question>
+ <answer>
+ <p>No. This is a maven plugin to generate Eclipse files for a maven project. This is not an Eclipse Plugin for Maven.</p>
+ </answer>
+ </faq>
+ <faq id="import-project">
+ <question>I already did <i>mvn eclipse:eclipse</i> but when I open Eclipse, my project is not there. Where is it?</question>
+ <answer>
+ <p>You may also need to import the project created by Maven Eclipse Plugin. More information can be found <a href="usage.html#Simple Project">here</a>.</p>
+ </answer>
+ </faq>
+ <faq id="use-add-maven-repo">
+ <question>After running <i>mvn eclipse:eclipse</i>, the generated dependencies are pointing to a non-existing file. What needs to be done?</question>
+ <answer>
+ <p>Before you can setup any maven project to your Eclipse IDE, you need to define first the location of your local repository to Eclipse. This is done by using: <a href="usage.html#Maven%20repository">eclipse:add-maven-repo</a></p>
+ </answer>
+ </faq>
+ <faq id="import-javadoc">
+ <question>Can I make the Eclipse plugin download and attach javadocs to my libraries?</question>
+ <answer>
+ <p>As of version 2.4, there is a new flag, downloadJavadocs that behaves exactly like downloadSources except for javadocs. See more information here: <a href="examples/attach-library-sources.html">Attach Library Sources</a>. </p>
+ </answer>
+ </faq>
+ </part>
+</faqs>
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/site/fml/faq.fml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/AddMavenRepoMojoTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/EclipseWorkspaceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseCodeFormatterTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseCodeFormatterTest.java?rev=640502&r1=640501&r2=640502&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseCodeFormatterTest.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseCodeFormatterTest.java Mon Mar 24 11:30:49 2008
@@ -1,39 +1,39 @@
-package org.apache.maven.plugin.eclipse.writers.workspace;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to you 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. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-public class EclipseCodeFormatterTest
- extends TestCase
-{
- private static File basedir = new File( System.getProperty( "basedir", "." ) );
-
- public void testLoadFormatter()
- throws Exception
- {
- File testStyleFile = new File( basedir, "src/test/resources/projects/workspace-02/code-styles.xml" );
-
- EclipseCodeFormatterProfile formatter = new EclipseCodeFormatterProfile();
- formatter.init( testStyleFile.toURL(), null );
-
- assertEquals( "format-1", formatter.getProfileName() );
-
- // see integration test on workspace-02 for content validation
- }
-}
+package org.apache.maven.plugin.eclipse.writers.workspace;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to you 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. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+public class EclipseCodeFormatterTest
+ extends TestCase
+{
+ private static File basedir = new File( System.getProperty( "basedir", "." ) );
+
+ public void testLoadFormatter()
+ throws Exception
+ {
+ File testStyleFile = new File( basedir, "src/test/resources/projects/workspace-02/code-styles.xml" );
+
+ EclipseCodeFormatterProfile formatter = new EclipseCodeFormatterProfile();
+ formatter.init( testStyleFile.toURL(), null );
+
+ assertEquals( "format-1", formatter.getProfileName() );
+
+ // see integration test on workspace-02 for content validation
+ }
+}
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/writers/workspace/EclipseCodeFormatterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-11/src/main/modello/dummy.mdo
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-11/src/main/modello/dummy.mdo?rev=640502&r1=640501&r2=640502&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-11/src/main/modello/dummy.mdo (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-11/src/main/modello/dummy.mdo Mon Mar 24 11:30:49 2008
@@ -1,24 +1,24 @@
-<model>
- <id>dummy</id>
- <name>Dummy</name>
- <defaults>
- <default>
- <key>package</key>
- <value>org.apache.maven.dummy</value>
- </default>
- </defaults>
- <classes>
- <class rootElement="true" xml.tagName="dummy">
- <name>Dummy</name>
- <version>1.0.0</version>
- <fields>
- <field>
- <name>version</name>
- <version>1.0.0</version>
- <required>true</required>
- <type>String</type>
- </field>
- </fields>
- </class>
- </classes>
-</model>
+<model>
+ <id>dummy</id>
+ <name>Dummy</name>
+ <defaults>
+ <default>
+ <key>package</key>
+ <value>org.apache.maven.dummy</value>
+ </default>
+ </defaults>
+ <classes>
+ <class rootElement="true" xml.tagName="dummy">
+ <name>Dummy</name>
+ <version>1.0.0</version>
+ <fields>
+ <field>
+ <name>version</name>
+ <version>1.0.0</version>
+ <required>true</required>
+ <type>String</type>
+ </field>
+ </fields>
+ </class>
+ </classes>
+</model>
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-11/src/main/modello/dummy.mdo
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-17/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-33/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-33/pom.xml?rev=640502&r1=640501&r2=640502&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-33/pom.xml (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-33/pom.xml Mon Mar 24 11:30:49 2008
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>eclipse</groupId>
- <artifactId>maven-eclipse-plugin-test-project-33</artifactId>
- <version>33</version>
- <packaging>jar</packaging>
- <dependencies>
- <dependency>
- <groupId>maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>98.0</version>
- </dependency>
- <dependency>
- <groupId>maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>98.0</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>test</version>
- <configuration>
- <downloadSources>true</downloadSources>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>eclipse</groupId>
+ <artifactId>maven-eclipse-plugin-test-project-33</artifactId>
+ <version>33</version>
+ <packaging>jar</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>98.0</version>
+ </dependency>
+ <dependency>
+ <groupId>maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>98.0</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-33/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-1/src/main/java/DummyClass.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/expected/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-2/src/main/java/DummyClass.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/target/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/target/eclipseEar/META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/expected/target/eclipseEar/META-INF/test-file.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-3/src/main/application/META-INF/test-file.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/multymodule-4/src/main/java/DummyClass.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-34/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-4/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-5/project-rad-4/src/main/resources/DummyResource.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/workspace-01/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/workspace-02/code-styles.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/workspace-02/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/test-harness/add-maven-repo/min-plugin-config.xml
------------------------------------------------------------------------------
svn:eol-style = native