geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r452242 - in /geronimo/devtools/eclipse-plugin/trunk: ./ features/ features/org.apache.geronimo.feature/ features/org.apache.geronimo.installableruntime.jetty.feature/ features/org.apache.geronimo.installableruntime.tomcat.feature/ maven-pl...
Date Mon, 02 Oct 2006 22:01:41 GMT
Author: sppatel
Date: Mon Oct  2 15:01:40 2006
New Revision: 452242

URL: http://svn.apache.org/viewvc?view=rev&rev=452242
Log:
mojo to gen a simple bundle qualifier, add root pom to features and gen a qualifier

Added:
    geronimo/devtools/eclipse-plugin/trunk/features/pom.xml   (with props)
    geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/BundleQualifierMojo.java
  (with props)
Modified:
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/pom.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/pom.xml?view=diff&rev=452242&r1=452241&r2=452242
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/pom.xml Mon
Oct  2 15:01:40 2006
@@ -6,14 +6,15 @@
   <name>${artifactId}</name>
   <parent>
     <groupId>org.apache.geronimo.devtools</groupId>
-    <artifactId>geronimo-eclipse-plugin</artifactId>
-    <version>1.1</version>
+    <artifactId>eclipse-features-parent</artifactId>
+    <version>1.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <build>
     <resources>
       <resource>
         <directory>.</directory>
+        <filtering>true</filtering>
         <includes>
           <include>feature.xml</include>
           <include>feature.properties</include>
@@ -29,18 +30,10 @@
       </resource>
     </resources>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <configuration>
-          <projectnatures>
-            <projectnature>org.eclipse.pde.FeatureNature</projectnature>
-          </projectnatures>
-          <buildcommands>
-            <buildcommand>org.eclipse.pde.FeatureBuilder</buildcommand>
-          </buildcommands>
-        </configuration>
-      </plugin>
+        <plugin>
+            <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>maven-geronimodevtools-plugin</artifactId>
+        </plugin>
     </plugins>
   </build>
 </project>

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/pom.xml?view=diff&rev=452242&r1=452241&r2=452242
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.jetty.feature/pom.xml
Mon Oct  2 15:01:40 2006
@@ -6,14 +6,15 @@
   <name>${artifactId}</name>
   <parent>
     <groupId>org.apache.geronimo.devtools</groupId>
-    <artifactId>geronimo-eclipse-plugin</artifactId>
-    <version>1.1</version>
+    <artifactId>eclipse-features-parent</artifactId>
+    <version>1.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <build>
     <resources>
       <resource>
         <directory>.</directory>
+        <filtering>true</filtering>
         <includes>
           <include>feature.xml</include>
           <include>feature.properties</include>
@@ -29,18 +30,10 @@
       </resource>
     </resources>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <configuration>
-          <projectnatures>
-            <projectnature>org.eclipse.pde.FeatureNature</projectnature>
-          </projectnatures>
-          <buildcommands>
-            <buildcommand>org.eclipse.pde.FeatureBuilder</buildcommand>
-          </buildcommands>
-        </configuration>
-      </plugin>
+        <plugin>
+            <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>maven-geronimodevtools-plugin</artifactId>
+        </plugin>
     </plugins>
   </build>
 </project>

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/pom.xml?view=diff&rev=452242&r1=452241&r2=452242
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.installableruntime.tomcat.feature/pom.xml
Mon Oct  2 15:01:40 2006
@@ -6,14 +6,15 @@
   <name>${artifactId}</name>
   <parent>
     <groupId>org.apache.geronimo.devtools</groupId>
-    <artifactId>geronimo-eclipse-plugin</artifactId>
-    <version>1.1</version>
+    <artifactId>eclipse-features-parent</artifactId>
+    <version>1.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <build>
     <resources>
       <resource>
         <directory>.</directory>
+        <filtering>true</filtering>
         <includes>
           <include>feature.xml</include>
           <include>feature.properties</include>
@@ -29,18 +30,10 @@
       </resource>
     </resources>
     <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <configuration>
-          <projectnatures>
-            <projectnature>org.eclipse.pde.FeatureNature</projectnature>
-          </projectnatures>
-          <buildcommands>
-            <buildcommand>org.eclipse.pde.FeatureBuilder</buildcommand>
-          </buildcommands>
-        </configuration>
-      </plugin>
+        <plugin>
+            <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>maven-geronimodevtools-plugin</artifactId>
+        </plugin>
     </plugins>
   </build>
 </project>

Added: geronimo/devtools/eclipse-plugin/trunk/features/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/pom.xml?view=auto&rev=452242
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/pom.xml (added)
+++ geronimo/devtools/eclipse-plugin/trunk/features/pom.xml Mon Oct  2 15:01:40 2006
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright 2006 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.
+-->
+<!-- $Rev$ $Date$ -->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.geronimo.devtools</groupId>
+    <artifactId>eclipse-features-parent</artifactId>
+    <packaging>pom</packaging>
+    <name>Parent POM :: ${artifactId}</name>
+    <version>1.0</version>
+    <parent>
+        <groupId>org.apache.geronimo.devtools</groupId>
+        <artifactId>geronimo-eclipse-plugin</artifactId>
+        <version>1.1</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.geronimo.devtools</groupId>
+                    <artifactId>maven-geronimodevtools-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>generate-qualifier</id>
+                            <phase>validate</phase>
+                            <goals>
+                                <goal>qualifier</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+    <modules>
+        <module>org.apache.geronimo.feature</module>
+        <module>org.apache.geronimo.installableruntime.jetty.feature</module>
+        <module>org.apache.geronimo.installableruntime.tomcat.feature</module>
+    </modules>
+</project>

Propchange: geronimo/devtools/eclipse-plugin/trunk/features/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/features/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/devtools/eclipse-plugin/trunk/features/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/BundleQualifierMojo.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/BundleQualifierMojo.java?view=auto&rev=452242
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/BundleQualifierMojo.java
(added)
+++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/BundleQualifierMojo.java
Mon Oct  2 15:01:40 2006
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2004, 2005 The Apache Software Foundation or its licensors, as applicable
+ *
+ *  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.
+ */
+package org.apache.geronimo.eclipse.devtools;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
+
+/**
+ * @goal qualifier
+ */
+public class BundleQualifierMojo extends AbstractMojo {
+	
+	/**
+	 * @parameter expression="${project}"
+	 */
+	private MavenProject project;
+
+	/* (non-Javadoc)
+	 * @see org.apache.maven.plugin.Mojo#execute()
+	 */
+	public void execute() throws MojoExecutionException, MojoFailureException {
+		DateFormat format = new SimpleDateFormat("yyyyMMddhhmm");
+		String qualifier = "v" + format.format(new Date());
+		getLog().info("Qualifier is: " + qualifier);
+		project.getProperties().put("qualifier", qualifier);
+	}
+
+}

Propchange: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/BundleQualifierMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/BundleQualifierMojo.java
------------------------------------------------------------------------------
    svn:keywords = Date Rev

Propchange: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/BundleQualifierMojo.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml?view=diff&rev=452242&r1=452241&r2=452242
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/pom.xml Mon Oct  2 15:01:40 2006
@@ -40,6 +40,7 @@
                             <id>install-dependencies</id>
                             <phase>validate</phase>
                             <goals>
+                                <goal>qualifier</goal>
                                 <goal>manifestbundles</goal>
                                 <goal>install</goal>
                             </goals>

Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?view=diff&rev=452242&r1=452241&r2=452242
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Mon Oct  2 15:01:40 2006
@@ -292,9 +292,7 @@
     <module>maven-plugins/maven-geronimodevtools-plugin</module>
     <module>emf</module>
     <module>plugins</module>
-    <module>features/org.apache.geronimo.feature</module>
-    <module>features/org.apache.geronimo.installableruntime.jetty.feature</module>
-    <module>features/org.apache.geronimo.installableruntime.tomcat.feature</module>
+    <module>features</module>
     <module>assembly</module>
   </modules>
   



Mime
View raw message