myfaces-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GitBox <...@apache.org>
Subject [GitHub] asfgit closed pull request #8: fix Meecrowave sample
Date Sun, 11 Mar 2018 10:31:46 GMT
asfgit closed pull request #8: fix Meecrowave sample
URL: https://github.com/apache/myfaces-tobago/pull/8
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/tobago-example/tobago-example-demo/pom.xml b/tobago-example/tobago-example-demo/pom.xml
index 34fa2e794..5d085a649 100644
--- a/tobago-example/tobago-example-demo/pom.xml
+++ b/tobago-example/tobago-example-demo/pom.xml
@@ -39,7 +39,10 @@
     <arquillian.browser>phantomjs</arquillian.browser>
     <selenium.version>3.7.1</selenium.version>
     <tomee.version>7.0.4</tomee.version>
+    <meecrowave.version>1.2.1-SNAPSHOT</meecrowave.version>
+    <tomcat.version>9.0.4</tomcat.version>
   </properties>
+
   <build>
     <finalName>tobago-example-demo</finalName>
     <testResources>
@@ -166,18 +169,6 @@
           </images>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.meecrowave</groupId>
-        <artifactId>meecrowave-maven-plugin</artifactId>
-        <version>1.2.0</version>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-el_2.2_spec</artifactId>
-            <version>1.0.4</version>
-          </dependency>
-        </dependencies>
-      </plugin>
     </plugins>
   </build>
 
@@ -234,6 +225,7 @@
 
   <dependencies>
 
+
     <!-- Tobago -->
     <dependency>
       <groupId>org.apache.myfaces.tobago</groupId>
@@ -997,5 +989,60 @@
         </plugins>
       </build>
     </profile>
+
+    <profile>
+      <id>meecrowave</id>
+
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.meecrowave</groupId>
+          <artifactId>meecrowave-core</artifactId>
+          <version>${meecrowave.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.openwebbeans</groupId>
+          <artifactId>openwebbeans-jsf</artifactId>
+          <version>${openwebbeans.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.tomcat</groupId>
+          <artifactId>tomcat-el-api</artifactId>
+          <version>${tomcat.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.tomcat</groupId>
+          <artifactId>tomcat-jasper-el</artifactId>
+          <version>${tomcat.version}</version>
+        </dependency>
+      </dependencies>
+
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.meecrowave</groupId>
+            <artifactId>meecrowave-maven-plugin</artifactId>
+            <version>${meecrowave.version}</version>
+            <configuration>
+              <scanningPackageIncludes>
+                org.apache.myfaces.tobago.example
+              </scanningPackageIncludes>
+            </configuration>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>tomcat-el-api</artifactId>
+                <version>${tomcat.version}</version>
+              </dependency>
+              <dependency>
+                <groupId>org.apache.tomcat</groupId>
+                <artifactId>tomcat-jasper-el</artifactId>
+                <version>${tomcat.version}</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>
diff --git a/tobago-example/tobago-example-demo/src/main/resources/META-INF/beans.xml b/tobago-example/tobago-example-demo/src/main/resources/META-INF/beans.xml
new file mode 100644
index 000000000..e69de29bb
diff --git a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml
index 65afe9ff7..df2c1200e 100644
--- a/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml
+++ b/tobago-example/tobago-example-demo/src/main/webapp/WEB-INF/web.xml
@@ -68,16 +68,16 @@
   </listener>
 
   <!-- activate this for some containers -->
-  <!--
   <listener>
     <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
   </listener>
-  -->
 
 <!-- this is not needed for websphere 8.5 -->
+<!-- and neither for tomcat if setup correctly...
   <listener>
     <listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
   </listener>
+-->
 
 <!-- this is an alternative to the WebBeansConfigurationListener
      you need it e.g. for Tomcat 5.5 or WebSphere 6.1 (see TOBAGO-1043)


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

Mime
View raw message