openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rsandt...@apache.org
Subject svn commit: r1697943 - in /openwebbeans/branches/cdi-2.0/samples: ./ guess/ guess/src/main/java/org/apache/webbeans/sample/bindings/ guess/src/main/java/org/apache/webbeans/sample/conversation/ guess/src/main/java/org/apache/webbeans/sample/model/conve...
Date Wed, 26 Aug 2015 14:21:19 GMT
Author: rsandtner
Date: Wed Aug 26 14:21:18 2015
New Revision: 1697943

URL: http://svn.apache.org/r1697943
Log:
OWB-1088 pom cleanup, removed unused classes, xhtmls, configuration

Removed:
    openwebbeans/branches/cdi-2.0/samples/guess/src/main/java/org/apache/webbeans/sample/bindings/JmsBinding.java
    openwebbeans/branches/cdi-2.0/samples/guess/src/main/java/org/apache/webbeans/sample/conversation/
    openwebbeans/branches/cdi-2.0/samples/guess/src/main/java/org/apache/webbeans/sample/model/conversation/
    openwebbeans/branches/cdi-2.0/samples/guess/src/main/resources/META-INF/openwebbeans/
    openwebbeans/branches/cdi-2.0/samples/guess/src/main/webapp/conversation.xhtml
    openwebbeans/branches/cdi-2.0/samples/guess/src/main/webapp/redirect.xhtml
Modified:
    openwebbeans/branches/cdi-2.0/samples/guess/pom.xml
    openwebbeans/branches/cdi-2.0/samples/guess/src/main/webapp/WEB-INF/faces-config.xml
    openwebbeans/branches/cdi-2.0/samples/pom.xml

Modified: openwebbeans/branches/cdi-2.0/samples/guess/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/samples/guess/pom.xml?rev=1697943&r1=1697942&r2=1697943&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/samples/guess/pom.xml (original)
+++ openwebbeans/branches/cdi-2.0/samples/guess/pom.xml Wed Aug 26 14:21:18 2015
@@ -17,18 +17,22 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
     <parent>
-        <artifactId>samples</artifactId>
         <groupId>org.apache.openwebbeans</groupId>
+        <artifactId>samples</artifactId>
         <version>2.0.0-alpha-1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.openwebbeans.samples</groupId>
     <artifactId>guess</artifactId>
     <packaging>war</packaging>
+
     <name>Sample Guess Application</name>
     <description>Simple login application</description>
 
@@ -36,25 +40,7 @@ under the License.
         <deploy.skip>true</deploy.skip>
     </properties>
 
-    <build>
-        <finalName>guess</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.tomcat.maven</groupId>
-                <artifactId>tomcat7-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
-
-        <!-- JSF Plugin -->
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-jsf</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
         <!-- Servlet API -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -62,24 +48,16 @@ under the License.
             <scope>provided</scope>
         </dependency>
 
-        <!-- JSR-299 implementation per application -->
+        <!-- JSR-330 API -->
         <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-impl</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-atinject_1.0_spec</artifactId>
         </dependency>
 
-        <!-- Web Plugin -->
-        <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-web</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-		
-		<!-- EL Plugin -->
+        <!-- JSR-250 API -->
         <dependency>
-            <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-el10</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.2_spec</artifactId>
         </dependency>
 
         <!-- JSR-299 API -->
@@ -88,28 +66,30 @@ under the License.
             <artifactId>geronimo-jcdi_2.0_spec</artifactId>
         </dependency>
 
-        <!-- JSR-330 API -->
+        <!-- JSR-299 implementation per application -->
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-atinject_1.0_spec</artifactId>
+            <groupId>org.apache.openwebbeans</groupId>
+            <artifactId>openwebbeans-impl</artifactId>
+            <scope>runtime</scope>
         </dependency>
-		
-		<!-- JSR-250 API -->
-		<dependency>
+
+        <!-- Interceptor API -->
+        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-annotation_1.2_spec</artifactId>
+            <artifactId>geronimo-interceptor_1.2_spec</artifactId>
         </dependency>
 
-        <!-- SPI API -->
+        <!-- JSF Plugin -->
         <dependency>
             <groupId>org.apache.openwebbeans</groupId>
-            <artifactId>openwebbeans-spi</artifactId>
+            <artifactId>openwebbeans-jsf</artifactId>
+            <version>${project.version}</version>
         </dependency>
 
-        <!-- Interceptor API -->
+        <!-- Web Plugin -->
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-interceptor_1.2_spec</artifactId>
+            <groupId>org.apache.openwebbeans</groupId>
+            <artifactId>openwebbeans-web</artifactId>
         </dependency>
 
         <!-- MyFaces IMPL -->
@@ -122,8 +102,19 @@ under the License.
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-impl</artifactId>
             <version>${myfaces2.version}</version>
+            <scope>runtime</scope>
         </dependency>
 
-
     </dependencies>
+
+    <build>
+        <finalName>guess</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.tomcat.maven</groupId>
+                <artifactId>tomcat7-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

Modified: openwebbeans/branches/cdi-2.0/samples/guess/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/samples/guess/src/main/webapp/WEB-INF/faces-config.xml?rev=1697943&r1=1697942&r2=1697943&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/samples/guess/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ openwebbeans/branches/cdi-2.0/samples/guess/src/main/webapp/WEB-INF/faces-config.xml Wed
Aug 26 14:21:18 2015
@@ -19,10 +19,7 @@ under the License.
 -->
 
 <faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
-              xmlns:xi="http://www.w3.org/2001/XInclude"
-              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
-
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
 
     <navigation-rule>
         <from-view-id>/home.xhtml</from-view-id>
@@ -40,14 +37,4 @@ under the License.
         </navigation-case>
     </navigation-rule>
 
-    <navigation-rule>
-        <from-view-id>/conversation.xhtml</from-view-id>
-        <navigation-case>
-            <from-outcome>toRedirect</from-outcome>
-            <to-view-id>/redirect.jsf?book=alis</to-view-id>
-            <redirect/>
-        </navigation-case>
-    </navigation-rule>
-
-
 </faces-config>

Modified: openwebbeans/branches/cdi-2.0/samples/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/branches/cdi-2.0/samples/pom.xml?rev=1697943&r1=1697942&r2=1697943&view=diff
==============================================================================
--- openwebbeans/branches/cdi-2.0/samples/pom.xml (original)
+++ openwebbeans/branches/cdi-2.0/samples/pom.xml Wed Aug 26 14:21:18 2015
@@ -32,13 +32,19 @@ under the License.
     <description>Apache OpenWebBeans Samples contains samples project for openwebbeans.</description>
 
     <properties>
+        <!--
+         * we just want to deploy the parent of our samples but net the samples itself.
+         * we have to override this property with true in every sample-module
+        -->
         <deploy.skip>false</deploy.skip>
+
         <myfaces2.version>2.2.8</myfaces2.version>
     </properties>
 
     <build>
         <pluginManagement>
             <plugins>
+                <!-- X TODO remove tomcat6 -->
                 <plugin>
                     <groupId>org.apache.tomcat.maven</groupId>
                     <artifactId>tomcat6-maven-plugin</artifactId>



Mime
View raw message