openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1602710 - in /openwebbeans/trunk: samples/ samples/reservation/ samples/reservation/src/main/resources/META-INF/ samples/reservation/src/main/webapp/META-INF/ samples/reservation/src/main/webapp/WEB-INF/ samples/reservation/src/main/webapp...
Date Sun, 15 Jun 2014 15:44:56 GMT
Author: struberg
Date: Sun Jun 15 15:44:55 2014
New Revision: 1602710

URL: http://svn.apache.org/r1602710
Log:
OWB-961 improve our reservation sample

work in progress...

Removed:
    openwebbeans/trunk/samples/reservation/src/main/webapp/META-INF/
    openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/beans.xml
    openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/lib/
Modified:
    openwebbeans/trunk/samples/pom.xml
    openwebbeans/trunk/samples/reservation/pom.xml
    openwebbeans/trunk/samples/reservation/src/main/resources/META-INF/beans.xml
    openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/web.xml
    openwebbeans/trunk/webbeans-tomcat7/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin

Modified: openwebbeans/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/pom.xml?rev=1602710&r1=1602709&r2=1602710&view=diff
==============================================================================
--- openwebbeans/trunk/samples/pom.xml (original)
+++ openwebbeans/trunk/samples/pom.xml Sun Jun 15 15:44:55 2014
@@ -60,51 +60,7 @@ 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>
     <modules>

Modified: openwebbeans/trunk/samples/reservation/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/pom.xml?rev=1602710&r1=1602709&r2=1602710&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/pom.xml (original)
+++ openwebbeans/trunk/samples/reservation/pom.xml Sun Jun 15 15:44:55 2014
@@ -19,8 +19,8 @@ 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">
     <parent>
-        <artifactId>samples</artifactId>
         <groupId>org.apache.openwebbeans</groupId>
+        <artifactId>samples</artifactId>
         <version>2.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
@@ -190,16 +190,12 @@ under the License.
 
     <profiles>
         <profile>
-            <id>jetty</id>
+            <id>tomcat</id>
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.mortbay.jetty</groupId>
-                        <artifactId>maven-jetty-plugin</artifactId>
-                        <version>6.1.22</version>
-                        <configuration>
-                            <scanIntervalSeconds>10</scanIntervalSeconds>
-                        </configuration>
+                        <groupId>org.apache.tomcat.maven</groupId>
+                        <artifactId>tomcat7-maven-plugin</artifactId>
                     </plugin>
                 </plugins>
             </build>
@@ -216,20 +212,17 @@ under the License.
                     <scope>compile</scope>
                 </dependency>
 
-                <!-- OpenJPA -->
+                <!-- CDI and atinject APIs -->
                 <dependency>
-                    <groupId>org.apache.openjpa</groupId>
-                    <artifactId>openjpa</artifactId>
-                    <version>2.0.1</version>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jcdi_1.1_spec</artifactId>
                     <scope>compile</scope>
                 </dependency>
-
                 <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-spi</artifactId>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-atinject_1.0_spec</artifactId>
                     <scope>compile</scope>
                 </dependency>
-
                 <!-- Interceptor API -->
                 <dependency>
                     <groupId>org.apache.geronimo.specs</groupId>
@@ -237,14 +230,6 @@ under the License.
                     <scope>compile</scope>
                 </dependency>
 
-                <!-- OWB Resource for Injections -->
-                <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-resource</artifactId>
-                    <version>${project.version}</version>
-                    <scope>compile</scope>
-                </dependency>
-
                 <!-- OWB Impl -->
                 <dependency>
                     <groupId>org.apache.openwebbeans</groupId>
@@ -253,15 +238,19 @@ under the License.
                     <scope>compile</scope>
                 </dependency>
 
+                <!-- Web Plugin -->
                 <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jcdi_1.1_spec</artifactId>
+                    <groupId>org.apache.openwebbeans</groupId>
+                    <artifactId>openwebbeans-web</artifactId>
+                    <version>${project.version}</version>
                     <scope>compile</scope>
                 </dependency>
 
+                <!-- our tomcat7++ integration module -->
                 <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-atinject_1.0_spec</artifactId>
+                    <groupId>org.apache.openwebbeans</groupId>
+                    <artifactId>openwebbeans-tomcat7</artifactId>
+                    <version>${project.version}</version>
                     <scope>compile</scope>
                 </dependency>
 
@@ -273,29 +262,23 @@ under the License.
                     <scope>compile</scope>
                 </dependency>
 
-                <!-- EL Plugin -->
+
+                <!-- OpenJPA -->
                 <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-el10</artifactId>
-                    <version>${project.version}</version>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jpa_2.0_spec</artifactId>
                     <scope>compile</scope>
                 </dependency>
 
 
-                <!-- Web Plugin -->
                 <dependency>
-                    <groupId>org.apache.openwebbeans</groupId>
-                    <artifactId>openwebbeans-web</artifactId>
-                    <version>${project.version}</version>
+                    <groupId>org.apache.openjpa</groupId>
+                    <artifactId>openjpa</artifactId>
+                    <version>2.0.1</version>
                     <scope>compile</scope>
                 </dependency>
 
-                <!-- JPA API -->
-                <dependency>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jpa_2.0_spec</artifactId>
-                    <scope>compile</scope>
-                </dependency>
+
 
             </dependencies>
         </profile>

Modified: openwebbeans/trunk/samples/reservation/src/main/resources/META-INF/beans.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/resources/META-INF/beans.xml?rev=1602710&r1=1602709&r2=1602710&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/resources/META-INF/beans.xml (original)
+++ openwebbeans/trunk/samples/reservation/src/main/resources/META-INF/beans.xml Sun Jun 15
15:44:55 2014
@@ -17,9 +17,8 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<WebBeans xmlns="urn:java:ee"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="urn:java:ee http://java.sun.com/jee/beans-1.0.xsd">
+<beans xmlns="http://java.sun.com/xml/ns/javaee" 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/beans_1_0.xsd">
     <decorators>
         <class>org.apache.webbeans.reservation.intercept.LoginDecorator</class>
     </decorators>
@@ -27,4 +26,4 @@ under the License.
     <interceptors>
         <class>org.apache.webbeans.reservation.intercept.TransactionalInterceptor</class>
     </interceptors>
-</WebBeans>
\ No newline at end of file
+</beans>
\ No newline at end of file

Modified: openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/web.xml?rev=1602710&r1=1602709&r2=1602710&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/web.xml (original)
+++ openwebbeans/trunk/samples/reservation/src/main/webapp/WEB-INF/web.xml Sun Jun 15 15:44:55
2014
@@ -17,17 +17,16 @@ KIND, either express or implied.  See th
 specific language governing permissions and limitations
 under the License.
 -->
-<web-app id="WebApp_ID" version="2.5"
+<web-app id="reservation" version="3.0"
          xmlns="http://java.sun.com/xml/ns/javaee"
-         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-app_2_5.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-app_3_0.xsd">
     <display-name>guess</display-name>
     <context-param>
         <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
         <param-value>.xhtml</param-value>
     </context-param>
-    <listener>
-        <listener-class>org.apache.webbeans.servlet.WebBeansConfigurationListener</listener-class>
-    </listener>
+
     <servlet>
         <servlet-name>Faces Servlet</servlet-name>
         <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
@@ -42,7 +41,7 @@ under the License.
     </welcome-file-list>
     <error-page>
         <exception-type>java.lang.Exception</exception-type>
-        <location>/src/main/webapp/index.html</location>
+        <location>/index.html</location>
     </error-page>
     <login-config>
         <auth-method>BASIC</auth-method>

Modified: openwebbeans/trunk/webbeans-tomcat7/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-tomcat7/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin?rev=1602710&r1=1602709&r2=1602710&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-tomcat7/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin
(original)
+++ openwebbeans/trunk/webbeans-tomcat7/src/main/resources/META-INF/services/org.apache.webbeans.spi.plugins.OpenWebBeansPlugin
Sun Jun 15 15:44:55 2014
@@ -1,17 +1,17 @@
-#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
+# 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.
+# 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.
 org.apache.webbeans.web.tomcat.TomcatWebPlugin
\ No newline at end of file



Mime
View raw message