Update of /var/cvs/applications/app-base
In directory james.mmbase.org:/tmp/cvs-serv32200

Modified Files:
        pom.xml 
Log Message:
ridiculously complex code to ensure that we can deploy both the pom of 
'app-base' itself, as it's extensions. A simple 'unless not exists' was 
actually all I was targeting for. Sigh


See also: http://cvs.mmbase.org/viewcvs/applications/app-base


Index: pom.xml
===================================================================
RCS file: /var/cvs/applications/app-base/pom.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- pom.xml     11 Feb 2009 23:06:50 -0000      1.10
+++ pom.xml     16 Feb 2009 18:43:00 -0000      1.11
@@ -49,6 +49,24 @@
 
     <plugins>
       <plugin>
+        <groupId>org.mmbase</groupId>
+        <artifactId>app-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>install</id>
+            <phase>install</phase>
+            <goals><goal>install-jar</goal></goals>
+          </execution>
+          <execution>
+            <id>deploy</id>
+            <phase>deploy</phase>
+            <goals><goal>deploy-jar</goal></goals>
+          </execution>
+        </executions>
+      </plugin>
+
+
+      <plugin>
         <artifactId>maven-war-plugin</artifactId>
         <version>2.1-alpha-2</version> <!-- need support for 
failonmissingweb.xml-->
         <configuration>
@@ -72,72 +90,9 @@
           </webResources>
         </configuration>
       </plugin>
-
     </plugins>
-  </build>
-  <profiles>
-    <profile>
-      <id>install-jars</id>
-      <activation>
-        <!--
-            I can't come up with anything better then this.
-            So it won't work directly after a clean.
-            But what can we do. mvn2 sucks a bit too.
-        -->
-        <file>
-          <exists>target/war</exists>
-        </file>
-      </activation>
-      <build>
-        <plugins>
-
-
-          <!-- We want to deploy/install the generated jar too -->
 
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-deploy-plugin</artifactId>
-            <executions>
-              <execution>
-                <phase>deploy</phase>
-                <goals><goal>deploy-file</goal></goals>
-                <configuration>
-                  <packaging>jar</packaging>
-                  
<file>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/lib/${project.artifactId}-${project.version}.jar</file>
-                  <artifactId>${project.artifactId}</artifactId>
-                  <groupId>${project.groupId}.jars</groupId>
-                  <version>${project.version}</version>
-                  <repositoryId>mmbase-snapshots</repositoryId>
-                  <!--
-                      
<url>${project.distributionManagement.repository.url}</url>
-                  -->
-                  
<url>${project.distributionManagement.snapshotRepository.url}</url>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-install-plugin</artifactId>
-            <executions>
-              <execution>
-                <phase>install</phase>
-                <goals><goal>install-file</goal></goals>
-                <configuration>
-                  <packaging>jar</packaging>
-                  
<file>${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/lib/${project.artifactId}-${project.version}.jar</file>
-                  <artifactId>${project.artifactId}</artifactId>
-                  <groupId>${project.groupId}.jars</groupId>
-              <version>${project.version}</version>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
       </build>
-    </profile>
-  </profiles>
 
   <dependencies>
     <dependency>
@@ -146,6 +101,13 @@
       <version>${mmbase.version}</version>
       <scope>provided</scope>
     </dependency>
+
+    <dependency>
+      <groupId>org.mmbase</groupId>
+      <artifactId>app-plugin</artifactId>
+      <version>1</version>
+      <type>maven-plugin</type>
+    </dependency>
   </dependencies>
 
 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to