o Formatted code

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@944868 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2010-05-16 15:47:09 +00:00
parent 1cadde7468
commit c031581c62
2 changed files with 138 additions and 126 deletions

View File

@ -1,3 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<!-- <!--
Artifact handlers are required by the dependency resolution mechanism and therefore needed by the core. Artifact handlers are required by the dependency resolution mechanism and therefore needed by the core.
@ -18,8 +39,7 @@ problem.
<component> <component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role> <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>pom</role-hint> <role-hint>pom</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
</implementation>
<configuration> <configuration>
<type>pom</type> <type>pom</type>
</configuration> </configuration>
@ -53,8 +73,7 @@ problem.
<component> <component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role> <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>jar</role-hint> <role-hint>jar</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
</implementation>
<configuration> <configuration>
<type>jar</type> <type>jar</type>
<language>java</language> <language>java</language>
@ -108,8 +127,7 @@ problem.
<component> <component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role> <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>ejb</role-hint> <role-hint>ejb</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
</implementation>
<configuration> <configuration>
<type>ejb</type> <type>ejb</type>
<extension>jar</extension> <extension>jar</extension>
@ -118,11 +136,9 @@ problem.
</configuration> </configuration>
</component> </component>
<component> <component>
<role>org.apache.maven.lifecycle.mapping.LifecycleMapping <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
</role>
<role-hint>ejb</role-hint> <role-hint>ejb</role-hint>
<implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
</implementation>
<configuration> <configuration>
<lifecycles> <lifecycles>
<lifecycle> <lifecycle>
@ -162,8 +178,7 @@ problem.
<component> <component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role> <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>ejb-client</role-hint> <role-hint>ejb-client</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
</implementation>
<configuration> <configuration>
<type>ejb-client</type> <type>ejb-client</type>
<extension>jar</extension> <extension>jar</extension>
@ -176,8 +191,7 @@ problem.
<component> <component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role> <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>ejb3</role-hint> <role-hint>ejb3</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
</implementation>
<configuration> <configuration>
<type>ejb3</type> <type>ejb3</type>
<includesDependencies>true</includesDependencies> <includesDependencies>true</includesDependencies>
@ -232,8 +246,7 @@ problem.
<component> <component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role> <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>test-jar</role-hint> <role-hint>test-jar</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
</implementation>
<configuration> <configuration>
<classifier>tests</classifier> <classifier>tests</classifier>
<extension>jar</extension> <extension>jar</extension>
@ -250,8 +263,7 @@ problem.
<component> <component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role> <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>maven-plugin</role-hint> <role-hint>maven-plugin</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
</implementation>
<configuration> <configuration>
<type>maven-plugin</type> <type>maven-plugin</type>
<extension>jar</extension> <extension>jar</extension>
@ -310,8 +322,7 @@ problem.
<component> <component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role> <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>java-source</role-hint> <role-hint>java-source</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
</implementation>
<configuration> <configuration>
<classifier>sources</classifier> <classifier>sources</classifier>
<type>java-source</type> <type>java-source</type>
@ -327,8 +338,7 @@ problem.
<component> <component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role> <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>javadoc</role-hint> <role-hint>javadoc</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
</implementation>
<configuration> <configuration>
<classifier>javadoc</classifier> <classifier>javadoc</classifier>
<type>javadoc</type> <type>javadoc</type>
@ -344,8 +354,7 @@ problem.
<component> <component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role> <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>war</role-hint> <role-hint>war</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
</implementation>
<configuration> <configuration>
<type>war</type> <type>war</type>
<includesDependencies>true</includesDependencies> <includesDependencies>true</includesDependencies>
@ -400,8 +409,7 @@ problem.
<component> <component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role> <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>ear</role-hint> <role-hint>ear</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
</implementation>
<configuration> <configuration>
<type>ear</type> <type>ear</type>
<includesDependencies>true</includesDependencies> <includesDependencies>true</includesDependencies>
@ -447,8 +455,7 @@ problem.
<component> <component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role> <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>rar</role-hint> <role-hint>rar</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
</implementation>
<configuration> <configuration>
<type>rar</type> <type>rar</type>
<includesDependencies>true</includesDependencies> <includesDependencies>true</includesDependencies>
@ -503,8 +510,7 @@ problem.
<component> <component>
<role>org.apache.maven.artifact.handler.ArtifactHandler</role> <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
<role-hint>par</role-hint> <role-hint>par</role-hint>
<implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
</implementation>
<configuration> <configuration>
<type>par</type> <type>par</type>
<includesDependencies>true</includesDependencies> <includesDependencies>true</includesDependencies>

View File

@ -1,26 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- <!--
Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE Licensed to the Apache Software Foundation (ASF) under one
file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file or more contributor license agreements. See the NOTICE file
to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with distributed with this work for additional information
the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by regarding copyright ownership. The ASF licenses this file
applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, to you under the Apache License, Version 2.0 (the
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language "License"); you may not use this file except in compliance
governing permissions and limitations under the License. with the License. You may obtain a copy of the License at
-->
<!-- http://www.apache.org/licenses/LICENSE-2.0
There is currently only one component descriptor that cannot be generated from annotations because of the Unless required by applicable law or agreed to in writing,
accompanying configuration. Our options are to embed this information programatically or use a configuration source software distributed under the License is distributed on an
to pull in the lifecycle information. "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.
-->
<!--
There is currently only one component descriptor that cannot be generated from annotations because of the
accompanying configuration. Our options are to embed this information programatically or use a configuration source
to pull in the lifecycle information.
-->
<component-set> <component-set>
<components> <components>
<component> <component>
<role>org.apache.maven.lifecycle.DefaultSchedules</role> <role>org.apache.maven.lifecycle.DefaultSchedules</role>
<implementation>org.apache.maven.lifecycle.DefaultSchedules</implementation> <implementation>org.apache.maven.lifecycle.DefaultSchedules</implementation>
<configuration> <configuration>
<schedules> <schedules>
<scheduling> <scheduling>
@ -46,93 +55,90 @@
</configuration> </configuration>
</component> </component>
<component> <component>
<role>org.apache.maven.lifecycle.Lifecycle</role> <role>org.apache.maven.lifecycle.Lifecycle</role>
<implementation>org.apache.maven.lifecycle.Lifecycle</implementation> <implementation>org.apache.maven.lifecycle.Lifecycle</implementation>
<role-hint>default</role-hint> <role-hint>default</role-hint>
<configuration> <configuration>
<id>default</id> <id>default</id>
<!-- START SNIPPET: lifecycle --> <!-- START SNIPPET: lifecycle -->
<phases> <phases>
<phase>validate</phase> <phase>validate</phase>
<phase>initialize</phase> <phase>initialize</phase>
<phase>generate-sources</phase> <phase>generate-sources</phase>
<phase>process-sources</phase> <phase>process-sources</phase>
<phase>generate-resources</phase> <phase>generate-resources</phase>
<phase>process-resources</phase> <phase>process-resources</phase>
<phase>compile</phase> <phase>compile</phase>
<phase>process-classes</phase> <phase>process-classes</phase>
<phase>generate-test-sources</phase> <phase>generate-test-sources</phase>
<phase>process-test-sources</phase> <phase>process-test-sources</phase>
<phase>generate-test-resources</phase> <phase>generate-test-resources</phase>
<phase>process-test-resources</phase> <phase>process-test-resources</phase>
<phase>test-compile</phase> <phase>test-compile</phase>
<phase>process-test-classes</phase> <phase>process-test-classes</phase>
<phase>test</phase> <phase>test</phase>
<phase>prepare-package</phase> <phase>prepare-package</phase>
<phase>package</phase> <phase>package</phase>
<phase>pre-integration-test</phase> <phase>pre-integration-test</phase>
<phase>integration-test</phase> <phase>integration-test</phase>
<phase>post-integration-test</phase> <phase>post-integration-test</phase>
<phase>verify</phase> <phase>verify</phase>
<phase>install</phase> <phase>install</phase>
<phase>deploy</phase> <phase>deploy</phase>
</phases> </phases>
<!-- END SNIPPET: lifecycle --> <!-- END SNIPPET: lifecycle -->
</configuration> </configuration>
</component> </component>
<component> <component>
<role>org.apache.maven.lifecycle.Lifecycle</role> <role>org.apache.maven.lifecycle.Lifecycle</role>
<implementation>org.apache.maven.lifecycle.Lifecycle</implementation> <implementation>org.apache.maven.lifecycle.Lifecycle</implementation>
<role-hint>clean</role-hint> <role-hint>clean</role-hint>
<configuration> <configuration>
<id>clean</id> <id>clean</id>
<phases> <phases>
<phase>pre-clean</phase> <phase>pre-clean</phase>
<phase>clean</phase> <phase>clean</phase>
<phase>post-clean</phase> <phase>post-clean</phase>
</phases> </phases>
<default-phases> <default-phases>
<clean> <clean>
org.apache.maven.plugins:maven-clean-plugin:2.4.1:clean org.apache.maven.plugins:maven-clean-plugin:2.4.1:clean
</clean> </clean>
</default-phases> </default-phases>
</configuration> </configuration>
</component> </component>
<component> <component>
<role>org.apache.maven.lifecycle.Lifecycle</role> <role>org.apache.maven.lifecycle.Lifecycle</role>
<implementation>org.apache.maven.lifecycle.Lifecycle</implementation> <implementation>org.apache.maven.lifecycle.Lifecycle</implementation>
<role-hint>site</role-hint> <role-hint>site</role-hint>
<configuration> <configuration>
<id>site</id> <id>site</id>
<phases> <phases>
<phase>pre-site</phase> <phase>pre-site</phase>
<phase>site</phase> <phase>site</phase>
<phase>post-site</phase> <phase>post-site</phase>
<phase>site-deploy</phase> <phase>site-deploy</phase>
</phases> </phases>
<default-phases> <default-phases>
<site> <site>
org.apache.maven.plugins:maven-site-plugin:2.0.1:site org.apache.maven.plugins:maven-site-plugin:2.0.1:site
</site> </site>
<site-deploy> <site-deploy>
org.apache.maven.plugins:maven-site-plugin:2.0.1:deploy org.apache.maven.plugins:maven-site-plugin:2.0.1:deploy
</site-deploy> </site-deploy>
</default-phases> </default-phases>
</configuration> </configuration>
</component> </component>
<component> <component>
<role>org.sonatype.plexus.components.sec.dispatcher.SecDispatcher <role>org.sonatype.plexus.components.sec.dispatcher.SecDispatcher</role>
</role>
<role-hint>maven</role-hint> <role-hint>maven</role-hint>
<implementation>org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher <implementation>org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher</implementation>
</implementation>
<description>Maven Security dispatcher</description> <description>Maven Security dispatcher</description>
<requirements> <requirements>
<requirement> <requirement>
<role>org.sonatype.plexus.components.cipher.PlexusCipher <role>org.sonatype.plexus.components.cipher.PlexusCipher</role>
</role>
<field-name>_cipher</field-name> <field-name>_cipher</field-name>
</requirement> </requirement>
</requirements> </requirements>