geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r529461 - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.deployment.model.edit/ org.apache.geronimo.deployment.model/ org.apache.geronimo.v11.deployment.model.edit/ org.apache.geronimo.v11.deployment.model/
Date Tue, 17 Apr 2007 00:58:44 GMT
Author: sppatel
Date: Mon Apr 16 17:58:41 2007
New Revision: 529461

URL: http://svn.apache.org/viewvc?view=rev&rev=529461
Log:
more pom cleanup

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml?view=diff&rev=529461&r1=529460&r2=529461
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model.edit/pom.xml
Mon Apr 16 17:58:41 2007
@@ -26,10 +26,6 @@
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <properties>
-        <imported-resources>
-            ${project.build.directory}/imported-resources</imported-resources>
-    </properties>
     <build>
         <resources>
             <resource>
@@ -64,31 +60,28 @@
                 <artifactId>maven-antrun-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>dependency-maven-plugin</artifactId>
+                <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
                         <phase>validate</phase>
                         <goals>
                             <goal>unpack</goal>
                         </goals>
+                        <configuration>
+                            <outputDirectory>${imported-resources}</outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.devtools</groupId>
+                                    <artifactId>geronimo-1.0-emf</artifactId>
+                                    <version>${version}</version>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <artifactItems>
-                        <artifactItem>
-                            <groupId>org.apache.geronimo.devtools</groupId>
-                            <artifactId>geronimo-1.0-emf</artifactId>
-                            <version>${version}</version>
-                            <type>jar</type>
-                        </artifactItem>
-                    </artifactItems>
-                    <outputDirectory>${imported-resources}</outputDirectory>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.geronimo.devtools</groupId>
@@ -106,7 +99,7 @@
                         </goals>
                         <configuration>
                             <genmodel>
-                                ${imported-resources}/emf/geronimo-web-1.0.genmodel</genmodel>
+                                ${project.build.directory}/dependency/emf/geronimo-web-1.0.genmodel</genmodel>
                         </configuration>
                     </execution>
                     <execution>
@@ -117,7 +110,7 @@
                         </goals>
                         <configuration>
                             <genmodel>
-                                ${imported-resources}/emf/openejb-jar-2.0.genmodel</genmodel>
+                                ${project.build.directory}/dependency/emf/openejb-jar-2.0.genmodel</genmodel>
                         </configuration>
                     </execution>
                     <execution>
@@ -128,7 +121,7 @@
                         </goals>
                         <configuration>
                             <genmodel>
-                                ${imported-resources}/emf/geronimo-connector-1.0.genmodel</genmodel>
+                                ${project.build.directory}/dependency/emf/geronimo-connector-1.0.genmodel</genmodel>
                         </configuration>
                     </execution>
                     <execution>
@@ -139,7 +132,7 @@
                         </goals>
                         <configuration>
                             <genmodel>
-                                ${imported-resources}/emf/geronimo-application-1.0.genmodel</genmodel>
+                                ${project.build.directory}/dependency/emf/geronimo-application-1.0.genmodel</genmodel>
                         </configuration>
                     </execution>
                     <execution>
@@ -150,7 +143,7 @@
                         </goals>
                         <configuration>
                             <genmodel>
-                                ${imported-resources}/emf/geronimo-application-client-1.0.genmodel</genmodel>
+                                ${project.build.directory}/dependency/emf/geronimo-application-client-1.0.genmodel</genmodel>
                         </configuration>
                     </execution>
                     <execution>
@@ -161,7 +154,7 @@
                         </goals>
                         <configuration>
                             <genmodel>
-                                ${imported-resources}/emf/geronimo-security-1.1.genmodel</genmodel>
+                                ${project.build.directory}/dependency/emf/geronimo-security-1.1.genmodel</genmodel>
                         </configuration>
                     </execution>
                 </executions>
@@ -175,4 +168,4 @@
             <version>${version}</version>
         </dependency>
     </dependencies>
-</project>
+</project>
\ No newline at end of file

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml?view=diff&rev=529461&r1=529460&r2=529461
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
Mon Apr 16 17:58:41 2007
@@ -26,10 +26,6 @@
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <properties>
-        <imported-resources>
-            ${project.build.directory}/imported-resources</imported-resources>
-    </properties>
     <build>
         <resources>
             <resource>
@@ -57,31 +53,28 @@
                 <artifactId>maven-antrun-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>dependency-maven-plugin</artifactId>
+                <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
                         <phase>validate</phase>
                         <goals>
                             <goal>unpack</goal>
                         </goals>
+                        <configuration>
+                            <outputDirectory>${imported-resources}</outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.devtools</groupId>
+                                    <artifactId>geronimo-1.0-emf</artifactId>
+                                    <version>${version}</version>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <artifactItems>
-                        <artifactItem>
-                            <groupId>org.apache.geronimo.devtools</groupId>
-                            <artifactId>geronimo-1.0-emf</artifactId>
-                            <version>${version}</version>
-                            <type>jar</type>
-                        </artifactItem>
-                    </artifactItems>
-                    <outputDirectory>${imported-resources}</outputDirectory>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.geronimo.devtools</groupId>
@@ -98,8 +91,7 @@
                             <goal>generate</goal>
                         </goals>
                         <configuration>
-                            <genmodel>
-                                ${imported-resources}/emf/geronimo-web-1.0.genmodel</genmodel>
+                            <genmodel>${project.build.directory}/dependency/emf/geronimo-web-1.0.genmodel</genmodel>
                         </configuration>
                     </execution>
                     <execution>
@@ -109,8 +101,7 @@
                             <goal>generate</goal>
                         </goals>
                         <configuration>
-                            <genmodel>
-                                ${imported-resources}/emf/openejb-jar-2.0.genmodel</genmodel>
+                            <genmodel>${project.build.directory}/dependency/emf/openejb-jar-2.0.genmodel</genmodel>
                         </configuration>
                     </execution>
                     <execution>
@@ -120,8 +111,7 @@
                             <goal>generate</goal>
                         </goals>
                         <configuration>
-                            <genmodel>
-                                ${imported-resources}/emf/geronimo-connector-1.0.genmodel</genmodel>
+                            <genmodel>${project.build.directory}/dependency/emf/geronimo-connector-1.0.genmodel</genmodel>
                         </configuration>
                     </execution>
                     <execution>
@@ -131,8 +121,7 @@
                             <goal>generate</goal>
                         </goals>
                         <configuration>
-                            <genmodel>
-                                ${imported-resources}/emf/geronimo-application-1.0.genmodel</genmodel>
+                            <genmodel>${project.build.directory}/dependency/emf/geronimo-application-1.0.genmodel</genmodel>
                         </configuration>
                     </execution>
                     <execution>
@@ -142,8 +131,7 @@
                             <goal>generate</goal>
                         </goals>
                         <configuration>
-                            <genmodel>
-                                ${imported-resources}/emf/geronimo-application-client-1.0.genmodel</genmodel>
+                            <genmodel>${project.build.directory}/dependency/emf/geronimo-application-client-1.0.genmodel</genmodel>
                         </configuration>
                     </execution>
                     <execution>
@@ -153,12 +141,11 @@
                             <goal>generate</goal>
                         </goals>
                         <configuration>
-                            <genmodel>
-                                ${imported-resources}/emf/geronimo-security-1.1.genmodel</genmodel>
+                            <genmodel>${project.build.directory}/dependency/emf/geronimo-security-1.1.genmodel</genmodel>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml?view=diff&rev=529461&r1=529460&r2=529461
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model.edit/pom.xml
Mon Apr 16 17:58:41 2007
@@ -26,10 +26,6 @@
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <properties>
-        <imported-resources>
-            ${project.build.directory}/imported-resources</imported-resources>
-    </properties>
     <build>
         <resources>
             <resource>
@@ -57,38 +53,35 @@
         </resources>
         <plugins>
             <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.geronimo.devtools</groupId>
                 <artifactId>maven-eclipse-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+            </plugin>
+            <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>dependency-maven-plugin</artifactId>
+                <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
                         <phase>validate</phase>
                         <goals>
                             <goal>unpack</goal>
                         </goals>
+                        <configuration>
+                            <outputDirectory>${imported-resources}</outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.devtools</groupId>
+                                    <artifactId>geronimo-1.1-emf</artifactId>
+                                    <version>${version}</version>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <artifactItems>
-                        <artifactItem>
-                            <groupId>org.apache.geronimo.devtools</groupId>
-                            <artifactId>geronimo-1.1-emf</artifactId>
-                            <version>${version}</version>
-                            <type>jar</type>
-                        </artifactItem>
-                    </artifactItems>
-                    <outputDirectory>${imported-resources}</outputDirectory>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.geronimo.devtools</groupId>
@@ -106,7 +99,7 @@
                         </goals>
                         <configuration>
                             <genmodel>
-                                ${imported-resources}/emf/geronimo-web-1.1.genmodel</genmodel>
+                                ${project.build.directory}/dependency/emf/geronimo-web-1.1.genmodel</genmodel>
                         </configuration>
                     </execution>
                     <execution>
@@ -117,7 +110,7 @@
                         </goals>
                         <configuration>
                             <genmodel>
-                                ${imported-resources}/emf/openejb-jar-2.1.genmodel</genmodel>
+                                ${project.build.directory}/dependency/emf/openejb-jar-2.1.genmodel</genmodel>
                         </configuration>
                     </execution>
                     <execution>
@@ -128,7 +121,7 @@
                         </goals>
                         <configuration>
                             <genmodel>
-                                ${imported-resources}/emf/geronimo-connector-1.1.genmodel</genmodel>
+                                ${project.build.directory}/dependency/emf/geronimo-connector-1.1.genmodel</genmodel>
                         </configuration>
                     </execution>
                     <execution>
@@ -139,7 +132,7 @@
                         </goals>
                         <configuration>
                             <genmodel>
-                                ${imported-resources}/emf/geronimo-application-1.1.genmodel</genmodel>
+                                ${project.build.directory}/dependency/emf/geronimo-application-1.1.genmodel</genmodel>
                         </configuration>
                     </execution>
                     <execution>
@@ -150,7 +143,7 @@
                         </goals>
                         <configuration>
                             <genmodel>
-                                ${imported-resources}/emf/geronimo-application-client-1.1.genmodel</genmodel>
+                                ${project.build.directory}/dependency/emf/geronimo-application-client-1.1.genmodel</genmodel>
                         </configuration>
                     </execution>
                     <execution>
@@ -161,7 +154,7 @@
                         </goals>
                         <configuration>
                             <genmodel>
-                                ${imported-resources}/emf/geronimo-security-1.1.genmodel</genmodel>
+                                ${project.build.directory}/dependency/emf/geronimo-security-1.1.genmodel</genmodel>
                         </configuration>
                     </execution>
                 </executions>
@@ -175,4 +168,4 @@
             <version>${version}</version>
         </dependency>
     </dependencies>
-</project>
+</project>
\ No newline at end of file

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml?view=diff&rev=529461&r1=529460&r2=529461
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.v11.deployment.model/pom.xml
Mon Apr 16 17:58:41 2007
@@ -26,10 +26,6 @@
         <version>2.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <properties>
-        <imported-resources>
-            ${project.build.directory}/imported-resources</imported-resources>
-    </properties>
     <build>
         <resources>
             <resource>
@@ -50,38 +46,35 @@
         </resources>
         <plugins>
             <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.geronimo.devtools</groupId>
                 <artifactId>maven-eclipse-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+            </plugin>
+            <plugin>
                 <artifactId>maven-jar-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>dependency-maven-plugin</artifactId>
+                <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
                         <phase>validate</phase>
                         <goals>
                             <goal>unpack</goal>
                         </goals>
+                        <configuration>
+                            <outputDirectory>${imported-resources}</outputDirectory>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.geronimo.devtools</groupId>
+                                    <artifactId>geronimo-1.1-emf</artifactId>
+                                    <version>${version}</version>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
                     </execution>
                 </executions>
-                <configuration>
-                    <artifactItems>
-                        <artifactItem>
-                            <groupId>org.apache.geronimo.devtools</groupId>
-                            <artifactId>geronimo-1.1-emf</artifactId>
-                            <version>${version}</version>
-                            <type>jar</type>
-                        </artifactItem>
-                    </artifactItems>
-                    <outputDirectory>${imported-resources}</outputDirectory>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.geronimo.devtools</groupId>
@@ -99,7 +92,7 @@
                         </goals>
                         <configuration>
                             <genmodel>
-                                ${imported-resources}/emf/geronimo-web-1.1.genmodel</genmodel>
+                                ${project.build.directory}/dependency/emf/geronimo-web-1.1.genmodel</genmodel>
                         </configuration>
                     </execution>
                     <execution>
@@ -110,7 +103,7 @@
                         </goals>
                         <configuration>
                             <genmodel>
-                                ${imported-resources}/emf/openejb-jar-2.1.genmodel</genmodel>
+                                ${project.build.directory}/dependency/emf/openejb-jar-2.1.genmodel</genmodel>
                         </configuration>
                     </execution>
                     <execution>
@@ -121,7 +114,7 @@
                         </goals>
                         <configuration>
                             <genmodel>
-                                ${imported-resources}/emf/geronimo-connector-1.1.genmodel</genmodel>
+                                ${project.build.directory}/dependency/emf/geronimo-connector-1.1.genmodel</genmodel>
                         </configuration>
                     </execution>
                     <execution>
@@ -132,7 +125,7 @@
                         </goals>
                         <configuration>
                             <genmodel>
-                                ${imported-resources}/emf/geronimo-application-1.1.genmodel</genmodel>
+                                ${project.build.directory}/dependency/emf/geronimo-application-1.1.genmodel</genmodel>
                         </configuration>
                     </execution>
                     <execution>
@@ -143,7 +136,7 @@
                         </goals>
                         <configuration>
                             <genmodel>
-                                ${imported-resources}/emf/geronimo-application-client-1.1.genmodel</genmodel>
+                                ${project.build.directory}/dependency/emf/geronimo-application-client-1.1.genmodel</genmodel>
                         </configuration>
                     </execution>
                     <execution>
@@ -154,11 +147,11 @@
                         </goals>
                         <configuration>
                             <genmodel>
-                                ${imported-resources}/emf/geronimo-security-1.1.genmodel</genmodel>
+                                ${project.build.directory}/dependency/emf/geronimo-security-1.1.genmodel</genmodel>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file



Mime
View raw message