myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ckor...@apache.org
Subject svn commit: r906239 - /myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/pom.xml
Date Wed, 03 Feb 2010 20:59:09 GMT
Author: ckormos
Date: Wed Feb  3 20:59:09 2010
New Revision: 906239

URL: http://svn.apache.org/viewvc?rev=906239&view=rev
Log:
fixed [TRINIDAD-1706] - Trinidad components showcase demo app doesn't include java sources
in packaged war

Modified:
    myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/pom.xml

Modified: myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/pom.xml?rev=906239&r1=906238&r2=906239&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/pom.xml (original)
+++ myfaces/trinidad/trunk/trinidad-examples/trinidad-components-showcase/pom.xml Wed Feb
 3 20:59:09 2010
@@ -79,55 +79,52 @@
     </build>
 
     <profiles>
-
-    <profile>
-      <id>jettyConfig</id>
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-            <groupId>javax.faces</groupId>
-            <artifactId>jsf-api</artifactId>
-            <version>${jsf-ri.version}</version>
-            <scope>compile</scope>
-          </dependency>
-
-          <dependency>
-            <groupId>javax.faces</groupId>
-            <artifactId>jsf-impl</artifactId>
-            <version>${jsf-ri.version}</version>
-            <scope>runtime</scope>
-          </dependency>
-
-          <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-api</artifactId>
-            <version>${jsf-myfaces.version}</version>
-            <scope>compile</scope>
-          </dependency>
-
-          <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-impl</artifactId>
-            <version>${jsf-myfaces.version}</version>
-            <scope>runtime</scope>
-          </dependency>
-        </dependencies>
-      </dependencyManagement>
-
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.mortbay.jetty</groupId>
-            <artifactId>maven-jetty-plugin</artifactId>
-            <configuration>
-              <scanIntervalSeconds>10</scanIntervalSeconds>
-            </configuration>
-          </plugin>
-       </plugins>
-     </build>
-   </profile>
-
-
+        <profile>
+          <id>jettyConfig</id>
+          <dependencyManagement>
+            <dependencies>
+              <dependency>
+                <groupId>javax.faces</groupId>
+                <artifactId>jsf-api</artifactId>
+                <version>${jsf-ri.version}</version>
+                <scope>compile</scope>
+              </dependency>
+
+              <dependency>
+                <groupId>javax.faces</groupId>
+                <artifactId>jsf-impl</artifactId>
+                <version>${jsf-ri.version}</version>
+                <scope>runtime</scope>
+              </dependency>
+
+              <dependency>
+                <groupId>org.apache.myfaces.core</groupId>
+                <artifactId>myfaces-api</artifactId>
+                <version>${jsf-myfaces.version}</version>
+                <scope>compile</scope>
+              </dependency>
+
+              <dependency>
+                <groupId>org.apache.myfaces.core</groupId>
+                <artifactId>myfaces-impl</artifactId>
+                <version>${jsf-myfaces.version}</version>
+                <scope>runtime</scope>
+              </dependency>
+            </dependencies>
+          </dependencyManagement>
+
+          <build>
+            <plugins>
+              <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <configuration>
+                  <scanIntervalSeconds>10</scanIntervalSeconds>
+                </configuration>
+              </plugin>
+           </plugins>
+         </build>
+       </profile>
 
         <profile>
             <id>includeSources</id>
@@ -137,56 +134,25 @@
               </property>
             </activation>
             <build>
-                <plugins>
-                    <!--
+                <plugins>                  
+                    <!-- include sources into the packaged war file under WEB-INF/src
-->
                     <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>generateSiteMap</id>
-                                <phase>process-resources</phase>
-                                <goals>
-                                  <goal>exec</goal>
-                                </goals>
-                            </execution>
-                        </executions>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-war-plugin</artifactId>
                         <configuration>
-                            <executable>java</executable>
-                            <arguments>
-                                <argument>-classpath</argument>
-                                <classpath/>
-                                <argument>org.apache.myfaces.trinidaddemo.support.util.SitemapGenerator</argument>
-                            </arguments>
+                            <webResources>
+                                <resource>
+                                    <!-- this is relative to the pom.xml directory -->
+                                    <directory>src/main/java</directory>
+                                    <targetPath>WEB-INF/src</targetPath>
+                                </resource>
+                            </webResources>
                         </configuration>
-                    </plugin> -->
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>dependency-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>unpack-source</id>
-                                <phase>install</phase>
-                                <goals>
-                                    <goal>unpack</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>org.apache.myfaces.trinidad</groupId>
-                                            <artifactId>trinidad-components-showcase</artifactId>
-                                            <version>1.2.14-SNAPSHOT</version>
-                                            <classifier>sources</classifier>
-                                        </artifactItem>
-                                    </artifactItems>
-                                    <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/src</outputDirectory>
-                                </configuration>
-                            </execution>
-                        </executions>
                     </plugin>
                 </plugins>
             </build>
         </profile>
+
     </profiles>
 
     <repositories>



Mime
View raw message