o using the name tesla

mkristian · Jun 28, 2011 · d08d7ad · d08d7ad
1 parent a55a2f0
commit d08d7ad
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 6 deletions.
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
@@ -24,9 +24,8 @@
     <version>3.0.4-SNAPSHOT</version>
   </parent>
 
-  <artifactId>apache-maven</artifactId>
+  <artifactId>tesla</artifactId>
   <packaging>pom</packaging>
-
   <name>Maven Distribution</name>
 
   <dependencies>
@@ -65,7 +64,7 @@
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-nop</artifactId>
+      <artifactId>slf4j-simple</artifactId>
     </dependency>
   </dependencies>
 

diff --git a/build.sh b/build.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+ant -Dmaven.home=${HOME}/tesla-3.0-SNAPSHOT -DdistributionName=tesla
diff --git a/build.xml b/build.xml
@@ -31,9 +31,12 @@ END SNIPPET: ant-bootstrap -->
 
 <project default="all" basedir="." xmlns:artifact="urn:maven-artifact-ant">
 
+  <property name="distributionDirectory" value="apache-maven"/>
+  <property name="distributionName" value="apache-maven"/>
   <property name="it.workdir.version" value="3.0.x" />
 
   <target name="initTaskDefs">
+    <echo>Building ${distributionName} ...</echo>
     <xmlproperty file="pom.xml" prefix="xmlPom" />
     <path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.1.1.jar" />
     <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" />
@@ -72,8 +75,8 @@ Do you want to continue?</input>
 
   <target name="init" depends="isMavenHomeSet">
     <!-- Initialize properties -->
-    <property name="maven.home.basename.expected" value="apache-maven-${xmlPom.project.version}" />
-    <property name="maven.assembly" location="apache-maven/target/${maven.home.basename.expected}-bin.zip" />
+    <property name="maven.home.basename.expected" value="${distributionName}-${xmlPom.project.version}" />
+    <property name="maven.assembly" location="${distributionDirectory}/target/${maven.home.basename.expected}-bin.zip" />
     <property name="maven.repo.local" value="${user.home}/.m2/repository" />
     <property name="maven.debug" value="-e" />
     <property name="maven.test.skip" value="false" />

diff --git a/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml b/maven-core/src/main/resources/META-INF/plexus/artifact-handlers.xml
@@ -557,6 +557,72 @@ problem.
           </lifecycle>
         </lifecycles>
       </configuration>
+    </component>   
+
+    <!-- New Artifact Handlers for Dyson 3.1 -->
+
+    <!--
+     | TESLA PLUGIN
+     |-->
+    <component>
+      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
+      <role-hint>tesla-plugin</role-hint>
+      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
+      <configuration>
+        <type>tesla-plugin</type>
+        <extension>jar</extension>
+        <language>java</language>
+        <addedToClasspath>true</addedToClasspath>
+      </configuration>
+    </component>
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>tesla-plugin</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <lifecycles>
+          <lifecycle>
+            <id>default</id>
+            <!-- START SNIPPET: maven-plugin-lifecycle -->
+            <phases>
+              <process-resources>
+                org.apache.maven.plugins:maven-resources-plugin:2.4.3:resources
+              </process-resources>
+              <compile>
+                org.apache.maven.plugins:maven-compiler-plugin:2.3.2:compile
+              </compile>
+              <process-classes>
+                org.eclipse.tesla.plugin:tesla-plugin-plugin:0.0.1-SNAPSHOT:descriptor,
+                org.sonatype.plugins:sisu-maven-plugin:1.1:main-index
+              </process-classes>
+              <process-test-resources>
+                org.apache.maven.plugins:maven-resources-plugin:2.4.3:testResources
+              </process-test-resources>
+              <test-compile>
+                org.apache.maven.plugins:maven-compiler-plugin:2.3.2:testCompile
+              </test-compile>
+              <process-test-classes>
+                org.sonatype.plugins:sisu-maven-plugin:1.1:test-index
+              </process-test-classes>
+              <test>
+                org.apache.maven.plugins:maven-surefire-plugin:2.7.2:test
+              </test>
+              <package>
+                org.apache.maven.plugins:maven-jar-plugin:2.3.1:jar,
+                org.apache.maven.plugins:maven-plugin-plugin:2.7:addPluginArtifactMetadata
+              </package>
+              <install>
+                org.apache.maven.plugins:maven-install-plugin:2.3.1:install
+              </install>
+              <deploy>
+                org.apache.maven.plugins:maven-deploy-plugin:2.5:deploy
+              </deploy>
+            </phases>
+            <!-- END SNIPPET: maven-plugin-lifecycle -->
+          </lifecycle>
+        </lifecycles>
+      </configuration>
     </component>    
+
   </components>
 </component-set>
diff --git a/pom.xml b/pom.xml
@@ -270,7 +270,7 @@
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-nop</artifactId>
+        <artifactId>slf4j-simple</artifactId>
         <version>${slf4jVersion}</version>
         <scope>runtime</scope>
       </dependency>