You are viewing a plain text version of this content. The canonical link for it is here.
Posted to kato-commits@incubator.apache.org by sp...@apache.org on 2009/05/25 22:48:23 UTC

svn commit: r778526 - in /incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins: kato.api.plugin/ kato.api.registry.plugin/ kato.api.registry.plugin/.settings/ kato.api.registry.plugin/src/main/java/org/kato/ kato.api.registry....

Author: spoole
Date: Mon May 25 22:48:23 2009
New Revision: 778526

URL: http://svn.apache.org/viewvc?rev=778526&view=rev
Log:
more adjusting of maven eclipse plugin projects

Added:
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/
      - copied from r778525, incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/src/main/java/org/kato/
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/src/main/java/org/kato/api/
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/src/main/java/org/kato/api/plugin/
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/src/main/java/org/kato/api/plugin/MyMojo.java
Removed:
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.plugin/
Modified:
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/.classpath
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/.project
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/.settings/org.eclipse.jdt.core.prefs
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/.settings/org.maven.ide.eclipse.prefs
    incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/pom.xml

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/.classpath
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/.classpath?rev=778526&r1=778525&r2=778526&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/.classpath (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/.classpath Mon May 25 22:48:23 2009
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/.project
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/.project?rev=778526&r1=778525&r2=778526&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/.project (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/.project Mon May 25 22:48:23 2009
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>kato.api.plugin</name>
-	<comment>Apache Kato</comment>
+	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
@@ -11,30 +11,13 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
 			<name>org.maven.ide.eclipse.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
 	</natures>
 </projectDescription>

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/.settings/org.eclipse.jdt.core.prefs?rev=778526&r1=778525&r2=778526&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/.settings/org.eclipse.jdt.core.prefs (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/.settings/org.eclipse.jdt.core.prefs Mon May 25 22:48:23 2009
@@ -1,5 +1,5 @@
-#Sat May 23 14:31:23 BST 2009
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+#Mon May 25 23:44:38 BST 2009
 eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/.settings/org.maven.ide.eclipse.prefs
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/.settings/org.maven.ide.eclipse.prefs?rev=778526&r1=778525&r2=778526&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/.settings/org.maven.ide.eclipse.prefs (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/.settings/org.maven.ide.eclipse.prefs Mon May 25 22:48:23 2009
@@ -1,9 +1,9 @@
-#Sun May 24 11:02:06 BST 2009
-version=1
-resolveWorkspaceProjects=true
+#Mon May 25 23:44:37 BST 2009
 activeProfiles=
 eclipse.preferences.version=1
 fullBuildGoals=process-test-resources
-resourceFilterGoals=process-resources resources\:testResources
 includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
 skipCompilerPlugin=true
+version=1

Modified: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/pom.xml?rev=778526&r1=778525&r2=778526&view=diff
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/pom.xml (original)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/pom.xml Mon May 25 22:48:23 2009
@@ -1,4 +1,4 @@
-<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">
+<?xml version="1.0" encoding="UTF-8"?><project>
   <parent>
     <artifactId>kato</artifactId>
     <groupId>org.apache.kato</groupId>
@@ -7,60 +7,21 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.kato</groupId>
   <artifactId>kato.api.plugin</artifactId>
-  <packaging>zip</packaging>
+  <packaging>maven-plugin</packaging>
+  <name>kato.api.plugin Maven Mojo</name>
   <version>0.0.1-SNAPSHOT</version>
-  <build>
-  	<plugins>
-  	
-  	<plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>unpack-dependencies</goal>
-            </goals>
-            <configuration>
-              <includes>**/*.class</includes>
-              <excludes>**/*.properties</excludes>
-              <outputDirectory>${project.build.directory}/classes</outputDirectory>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>true</overWriteSnapshots>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-  	
-  	
-  	
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>pde-maven-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <eclipseInstall>/home/spoole/eclipseinstall/eclipse</eclipseInstall>
-        </configuration>
-      </plugin>
-    	<plugin>
-			<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.6</source>
-					<target>1.6</target>
-				</configuration>
-		</plugin>
-	</plugins>
-    
-  	
-  </build>
+  <url>http://maven.apache.org</url>
   <dependencies>
-  	<dependency>
-  		<groupId>org.apache.kato</groupId>
-  		<artifactId>kato.api</artifactId>
-  		<version>0.0.1-SNAPSHOT</version>
-  		<type>jar</type>
-  	</dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
-</project>
+</project>
\ No newline at end of file

Added: incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/src/main/java/org/kato/api/plugin/MyMojo.java
URL: http://svn.apache.org/viewvc/incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/src/main/java/org/kato/api/plugin/MyMojo.java?rev=778526&view=auto
==============================================================================
--- incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/src/main/java/org/kato/api/plugin/MyMojo.java (added)
+++ incubator/kato/branches/experimental/maven_restructure/org.apache.kato/plugins/kato.api.registry.plugin/src/main/java/org/kato/api/plugin/MyMojo.java Mon May 25 22:48:23 2009
@@ -0,0 +1,81 @@
+package org.kato.api.plugin;
+
+/*
+ * Copyright 2001-2005 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
+/**
+ * Goal which touches a timestamp file.
+ *
+ * @goal touch
+ * 
+ * @phase process-sources
+ */
+public class MyMojo
+    extends AbstractMojo
+{
+    /**
+     * Location of the file.
+     * @parameter expression="${project.build.directory}"
+     * @required
+     */
+    private File outputDirectory;
+
+    public void execute()
+        throws MojoExecutionException
+    {
+        File f = outputDirectory;
+
+        if ( !f.exists() )
+        {
+            f.mkdirs();
+        }
+
+        File touch = new File( f, "touch.txt" );
+
+        FileWriter w = null;
+        try
+        {
+            w = new FileWriter( touch );
+
+            w.write( "touch.txt" );
+        }
+        catch ( IOException e )
+        {
+            throw new MojoExecutionException( "Error creating file " + touch, e );
+        }
+        finally
+        {
+            if ( w != null )
+            {
+                try
+                {
+                    w.close();
+                }
+                catch ( IOException e )
+                {
+                    // ignore
+                }
+            }
+        }
+    }
+}