openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1606559 - in /openwebbeans/trunk/samples: guess/pom.xml pom.xml tomcat-sample/src/main/webapp/index.jsp
Date Sun, 29 Jun 2014 18:27:52 GMT
Author: struberg
Date: Sun Jun 29 18:27:52 2014
New Revision: 1606559

URL: http://svn.apache.org/r1606559
Log:
merge in sample fixes from owb-1.2.x

Added:
    openwebbeans/trunk/samples/tomcat-sample/src/main/webapp/index.jsp   (with props)
Modified:
    openwebbeans/trunk/samples/guess/pom.xml
    openwebbeans/trunk/samples/pom.xml

Modified: openwebbeans/trunk/samples/guess/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/pom.xml?rev=1606559&r1=1606558&r2=1606559&view=diff
==============================================================================
--- openwebbeans/trunk/samples/guess/pom.xml (original)
+++ openwebbeans/trunk/samples/guess/pom.xml Sun Jun 29 18:27:52 2014
@@ -40,43 +40,18 @@ under the License.
         <finalName>guess</finalName>
         <plugins>
             <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
-                <version>6.1.18</version>
-                <configuration>
-                    <scanIntervalSeconds>10</scanIntervalSeconds>
-                </configuration>
+                <groupId>org.apache.tomcat.maven</groupId>
+                <artifactId>tomcat7-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
 
     <dependencies>
 
-        <!-- JSF Facelet -->
-        <dependency>
-            <groupId>com.sun.facelets</groupId>
-            <artifactId>jsf-facelets</artifactId>
-            <version>1.1.14</version>
-        </dependency>
-
-        <!-- MyFaces API -->
-        <dependency>
-            <groupId>org.apache.myfaces.core</groupId>
-            <artifactId>myfaces-api</artifactId>
-            <version>1.2.8</version>
-        </dependency>
-
         <!-- JSF Plugin -->
         <dependency>
             <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-jsf12</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <!-- EL Plugin -->
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-el10</artifactId>
+            <artifactId>openwebbeans-jsf</artifactId>
             <version>${project.version}</version>
         </dependency>
 
@@ -127,8 +102,13 @@ under the License.
         <!-- MyFaces IMPL -->
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
+            <artifactId>myfaces-api</artifactId>
+            <version>${myfaces2.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-impl</artifactId>
-            <version>1.2.8</version>
+            <version>${myfaces2.version}</version>
         </dependency>
 
 

Modified: openwebbeans/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/pom.xml?rev=1606559&r1=1606558&r2=1606559&view=diff
==============================================================================
--- openwebbeans/trunk/samples/pom.xml (original)
+++ openwebbeans/trunk/samples/pom.xml Sun Jun 29 18:27:52 2014
@@ -60,6 +60,50 @@ under the License.
                     <skip>${deploy.skip}</skip> <!-- we don't deploy our samples
upstream -->
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>2.0.2</version>
+                <configuration>
+                    <archiveClasses>true</archiveClasses>
+                    <archive>
+                        <!-- Do not include META-INF/maven to avoid long file problems
on windows -->
+                        <addMavenDescriptor>false</addMavenDescriptor>
+                    </archive>
+
+                    <!--
+                    HACK: Include legal files explicity, otherwise they will end up in the
wrong path
+                          or in another jar file in the war.
+
+                    NOTE: targetPath is broken for webResources (as documented)
+                    -->
+                    <webResources>
+                        <resource>
+                            <directory>.</directory>
+                            <targetPath>META-INF</targetPath>
+                            <includes>
+                                <include>LICENSE</include>
+                                <include>NOTICE</include>
+                            </includes>
+                        </resource>
+                    </webResources>
+                    <archive>
+                        <manifestEntries>
+                            <Specification-Title>${project.name}</Specification-Title>
+                            <Specification-Version>${project.version}</Specification-Version>
+                            <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+                            <Implementation-Title>${project.name}</Implementation-Title>
+                            <Implementation-Version>${project.version}</Implementation-Version>
+                            <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+                            <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+                        </manifestEntries>
+                        <!-- add the generated manifest to the war -->
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+
+                    </archive>
+
+                </configuration>
+            </plugin>
 
         </plugins>
     </build>

Added: openwebbeans/trunk/samples/tomcat-sample/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/tomcat-sample/src/main/webapp/index.jsp?rev=1606559&view=auto
==============================================================================
--- openwebbeans/trunk/samples/tomcat-sample/src/main/webapp/index.jsp (added)
+++ openwebbeans/trunk/samples/tomcat-sample/src/main/webapp/index.jsp Sun Jun 29 18:27:52
2014
@@ -0,0 +1,19 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<meta http-equiv="refresh" content="0;url=/tomcat-sample/injector"/>

Propchange: openwebbeans/trunk/samples/tomcat-sample/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message