myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jak...@apache.org
Subject svn commit: r992381 - in /myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb: ./ src/main/resources/META-INF/maven/ src/main/resources/archetype-resources/ src/main/resources/archetype-resources/src/main/log4j/
Date Fri, 03 Sep 2010 17:07:49 GMT
Author: jakobk
Date: Fri Sep  3 17:07:48 2010
New Revision: 992381

URL: http://svn.apache.org/viewvc?rev=992381&view=rev
Log:
updated helloworld20-owb archetype

Removed:
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/src/main/log4j/
Modified:
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/pom.xml
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/META-INF/maven/archetype.xml
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/pom.xml

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/pom.xml?rev=992381&r1=992380&r2=992381&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/pom.xml
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/pom.xml
Fri Sep  3 17:07:48 2010
@@ -31,7 +31,7 @@
     <groupId>org.apache.myfaces.buildtools</groupId>
     <artifactId>myfaces-archetype-helloworld20-owb</artifactId>
     <packaging>jar</packaging>
-    <name>MyFaces and OWB Basic Archetype</name>
+    <name>MyFaces 2.0 and OWB Basic Archetype</name>
     <description>Archetype to create a new webapp based on MyFaces 2.0 with OpenWebBeans</description>
 
 </project>

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/META-INF/maven/archetype.xml?rev=992381&r1=992380&r2=992381&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/META-INF/maven/archetype.xml
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/META-INF/maven/archetype.xml
Fri Sep  3 17:07:48 2010
@@ -27,7 +27,6 @@
         <source>src/main/java/GreetingService.java</source>
     </sources>
     <resources>
-        <resource>src/main/log4j/log4j.properties</resource>
         <resource>src/main/webapp/index.html</resource>
         <resource>src/main/webapp/helloWorld.xhtml</resource>
         <resource>src/main/webapp/page2.xhtml</resource>

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/pom.xml?rev=992381&r1=992380&r2=992381&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/pom.xml
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld20-owb/src/main/resources/archetype-resources/pom.xml
Fri Sep  3 17:07:48 2010
@@ -27,49 +27,37 @@
     <artifactId>${artifactId}</artifactId>
     <packaging>war</packaging>
     <version>${version}</version>
-    <name>A custom project using MyFaces 2.0</name>
+    <name>A custom project using MyFaces 2.0 and OpenWebBeans</name>
     <url>http://www.myorganization.org</url>
 
     <properties>
         <jsf-myfaces.version>2.0.1</jsf-myfaces.version>
         <jsf-mojarra.version>2.0.3</jsf-mojarra.version>
         <openwebbeans.version>1.0.0-alpha-2</openwebbeans.version>
-        <maven.jetty.plugin.version>6.1.16</maven.jetty.plugin.version>
-        <log4j.version>1.2.13</log4j.version>
+        <maven.jetty.plugin.version>6.1.22</maven.jetty.plugin.version>
     </properties>
 
     <build>
         <finalName>${artifactId}</finalName>
-		<plugins>
+        <plugins>
             <plugin>
-                <!--This plugin allows to run the example using mvn jetty:run-exploded
-->
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <version>${maven.jetty.plugin.version}</version>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <scanIntervalSeconds>10</scanIntervalSeconds>
+                    <source>1.5</source>
+                    <target>1.5</target>
                 </configuration>
             </plugin>
-		</plugins>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <configuration>
-                        <source>1.5</source>
-                        <target>1.5</target>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
+        </plugins>
     </build>
     
     <profiles>
         <profile>
             <id>myfaces</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <property>
+                    <name>!jsf</name>
+                </property>
             </activation>
             <dependencies>
                 <dependency>
@@ -82,85 +70,68 @@
                     <groupId>org.apache.myfaces.core</groupId>
                     <artifactId>myfaces-impl</artifactId>
                     <version>${jsf-myfaces.version}</version>
-                    <scope>compile</scope>
+                    <scope>runtime</scope>
                 </dependency>
             </dependencies>
         </profile>
+        
         <profile>
-            <!-- Activate by adding -P mojarra when execute maven goals. -->
+            <!-- Activate by adding -Djsf=mojarra -->
             <id>mojarra</id>
             <activation>
-                <activeByDefault>false</activeByDefault>
+                <property>
+                    <name>jsf</name>
+                    <value>mojarra</value>
+                </property>
             </activation>
             <dependencies>
                 <dependency>
                     <groupId>com.sun.faces</groupId>
                     <artifactId>jsf-api</artifactId>
                     <version>${jsf-mojarra.version}</version>
+                    <scope>compile</scope>
                 </dependency>
                 <dependency>
                     <groupId>com.sun.faces</groupId>
                     <artifactId>jsf-impl</artifactId>
                     <version>${jsf-mojarra.version}</version>
+                    <scope>runtime</scope>
                 </dependency>
             </dependencies>
+            <repositories>
+                <repository>
+                    <id>java.net</id>
+                    <url>http://download.java.net/maven/2</url>
+                </repository>
+            </repositories>
         </profile>
         
         <profile>
-            <!-- Debug profile for myfaces and jetty.
-                It allows to see debug messages using -PjettyConfig -->
+            <!-- Use mvn clean jetty:run-exploded -PjettyConfig to run with jetty -->
             <id>jettyConfig</id>
             <build>
-                <resources>
-                    <resource>
-                        <directory>src/main/resources</directory>
-                    </resource>
-                    <resource>
-                        <directory>src/main/log4j</directory>
-                    </resource>
-                </resources>
                 <plugins>
                     <plugin>
-                        <!--This plugin allows to run the example using mvn jetty:run
-->
+                        <!--This plugin allows to run the war using mvn jetty:run -->
                         <groupId>org.mortbay.jetty</groupId>
                         <artifactId>maven-jetty-plugin</artifactId>
                         <version>${maven.jetty.plugin.version}</version>
                         <configuration>
                             <scanIntervalSeconds>10</scanIntervalSeconds>
-                            <systemProperties>
-                                <systemProperty>
-                                    <name>org.apache.commons.logging.Log</name>
-                                    <value>org.apache.commons.logging.impl.Log4JLogger</value>
-                                </systemProperty>
-                            </systemProperties>
                         </configuration>
                     </plugin>
                 </plugins>
             </build>
-            <dependencies>
-                <dependency>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                    <version>${log4j.version}</version>
-                    <type>jar</type>
-                </dependency>
-            </dependencies>
         </profile>
     </profiles>
 
-    <repositories>
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/2</url>
-        </repository>
-    </repositories>
-
     <!-- Project dependencies -->
     <dependencies>
         <dependency>
             <groupId>org.apache.openwebbeans</groupId>
             <artifactId>openwebbeans-impl</artifactId>
             <version>${openwebbeans.version}</version>
+            <scope>runtime</scope>
         </dependency>
 
         <dependency>
@@ -185,27 +156,38 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.openwebbeans</groupId>
+            <artifactId>openwebbeans-resource</artifactId>
+            <version>${openwebbeans.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-interceptor_1.1_spec</artifactId>
-            <version>1.0</version>
+            <artifactId>geronimo-jta_1.1_spec</artifactId>
+            <version>1.1.1</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+            <artifactId>geronimo-interceptor_1.1_spec</artifactId>
             <version>1.0</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-atinject_1.0_spec</artifactId>
             <version>1.0</version>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>jsr250-api</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
             <version>1.0</version>
+            <scope>compile</scope>
         </dependency>
         
         <dependency>



Mime
View raw message