geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pra...@apache.org
Subject svn commit: r550875 - in /geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources: META-INF/ archetype-resources/ archetype-resources/sample-ear/ archetype-resources/sample-war/
Date Tue, 26 Jun 2007 17:40:10 GMT
Author: prasad
Date: Tue Jun 26 10:40:09 2007
New Revision: 550875

URL: http://svn.apache.org/viewvc?view=rev&rev=550875
Log:
* deleted install-sample.html
* copy target binary to parent dir
* configure site-plugin to use "docs" dir.
* copy reports from "docs" dir instead of "site"

Removed:
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/install-sample.html
Modified:
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/META-INF/archetype.xml
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/pom.xml

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/META-INF/archetype.xml?view=diff&rev=550875&r1=550874&r2=550875
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/META-INF/archetype.xml
(original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/META-INF/archetype.xml
Tue Jun 26 10:40:09 2007
@@ -25,7 +25,6 @@
     <id>samples</id>
     <resources>
         <resource>pom.xml</resource>
-        <resource>install-sample.html</resource>
         <resource>sample-ear/pom.xml</resource>
         <resource>sample-ejb/pom.xml</resource>
         <resource>sample-ear/src/main/resources/META-INF/geronimo-application.xml</resource>

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml?view=diff&rev=550875&r1=550874&r2=550875
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml
Tue Jun 26 10:40:09 2007
@@ -45,6 +45,18 @@
         <module>${artifactId}-ear</module>
     </modules>
 
+   <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-site-plugin</artifactId>
+                <inherited>false</inherited>
+                <configuration>
+                  <outputDirectory>${project.basedir}/docs</outputDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <repositories>
         <repository>
             <id>apache-snapshots</id>

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml?view=diff&rev=550875&r1=550874&r2=550875
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml
(original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml
Tue Jun 26 10:40:09 2007
@@ -77,23 +77,28 @@
                     </modules>
                 </configuration>
             </plugin>
+
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>install</phase>
+                        <id>copy-parent-target</id>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <echo>Copying ${pom.build.finalName}.ear file to parent</echo>
+                                <copy file ="${project.build.directory}/${pom.artifactId}-${pom.version}.ear"
todir="${pom.basedir}/.." failonerror="false" overwrite="true" />
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>user</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.geronimo.plugins</groupId>
-                        <artifactId>geronimo-maven-plugin</artifactId>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 
 </project>
 

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/pom.xml?view=diff&rev=550875&r1=550874&r2=550875
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/pom.xml
(original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/pom.xml
Tue Jun 26 10:40:09 2007
@@ -62,7 +62,7 @@
                             <tasks>
                               <echo>Copying site directory from parent</echo>
                                 <copy todir="${project.build.directory}/${pom.artifactId}-${version}"
failonerror="false" overwrite="true">
-                                    <fileset dir="${pom.basedir}/../target/site"/>
+                                    <fileset dir="${pom.basedir}/../docs"/>
                                 </copy>
                             </tasks>
                         </configuration>



Mime
View raw message