You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2016/08/29 13:49:56 UTC
svn commit: r1758228 - in /openwebbeans/trunk: ./ distribution/src/assembly/
samples/ samples/conversation-sample/ samples/guess/
samples/guess/src/main/resources/META-INF/openwebbeans/ samples/jsf2sample/
samples/reservation/ samples/tomcat-sample/ we...
Author: struberg
Date: Mon Aug 29 13:49:55 2016
New Revision: 1758228
URL: http://svn.apache.org/viewvc?rev=1758228&view=rev
Log:
OWB-1145 Drop EL-1.0 module for OWB-1.7.x
Removed:
openwebbeans/trunk/samples/guess/src/main/resources/META-INF/openwebbeans/
openwebbeans/trunk/samples/tomcat-sample/
openwebbeans/trunk/webbeans-el10/
Modified:
openwebbeans/trunk/distribution/src/assembly/dist-binary.xml
openwebbeans/trunk/pom.xml
openwebbeans/trunk/samples/conversation-sample/pom.xml
openwebbeans/trunk/samples/guess/pom.xml
openwebbeans/trunk/samples/jsf2sample/pom.xml
openwebbeans/trunk/samples/pom.xml
openwebbeans/trunk/samples/reservation/pom.xml
openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/adaptor/ELAdaptor.java
Modified: openwebbeans/trunk/distribution/src/assembly/dist-binary.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/distribution/src/assembly/dist-binary.xml?rev=1758228&r1=1758227&r2=1758228&view=diff
==============================================================================
--- openwebbeans/trunk/distribution/src/assembly/dist-binary.xml (original)
+++ openwebbeans/trunk/distribution/src/assembly/dist-binary.xml Mon Aug 29 13:49:55 2016
@@ -97,7 +97,6 @@ under the License.
<include>org.apache.openwebbeans:openwebbeans-ejb</include>
<include>org.apache.openwebbeans:openwebbeans-ee</include>
<include>org.apache.openwebbeans:openwebbeans-ee-common</include>
- <include>org.apache.openwebbeans:openwebbeans-el10</include>
<include>org.apache.openwebbeans:openwebbeans-el22</include>
<include>org.apache.openwebbeans:openwebbeans-resource</include>
<include>org.apache.openwebbeans:openwebbeans-osgi</include>
Modified: openwebbeans/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/pom.xml?rev=1758228&r1=1758227&r2=1758228&view=diff
==============================================================================
--- openwebbeans/trunk/pom.xml (original)
+++ openwebbeans/trunk/pom.xml Mon Aug 29 13:49:55 2016
@@ -488,8 +488,7 @@
<module>webbeans-tomcat7</module>
<module>webbeans-jms</module>
<module>webbeans-jsf</module>
- <module>webbeans-el10</module>
- <module>webbeans-el22</module>
+ <module>webbeans-el22</module>
<module>webbeans-resource</module>
<module>webbeans-jee5-ejb-resource</module>
<module>webbeans-osgi</module>
Modified: openwebbeans/trunk/samples/conversation-sample/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/conversation-sample/pom.xml?rev=1758228&r1=1758227&r2=1758228&view=diff
==============================================================================
--- openwebbeans/trunk/samples/conversation-sample/pom.xml (original)
+++ openwebbeans/trunk/samples/conversation-sample/pom.xml Mon Aug 29 13:49:55 2016
@@ -91,13 +91,6 @@ under the License.
<version>${myfaces.version}</version>
</dependency>
- <!-- JSF Facelet -->
- <dependency>
- <groupId>com.sun.facelets</groupId>
- <artifactId>jsf-facelets</artifactId>
- <version>1.1.14</version>
- </dependency>
-
<!-- JSR-299 API -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -123,7 +116,7 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
Modified: openwebbeans/trunk/samples/guess/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/guess/pom.xml?rev=1758228&r1=1758227&r2=1758228&view=diff
==============================================================================
--- openwebbeans/trunk/samples/guess/pom.xml (original)
+++ openwebbeans/trunk/samples/guess/pom.xml Mon Aug 29 13:49:55 2016
@@ -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>1.6.4-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -74,11 +74,11 @@ under the License.
<artifactId>openwebbeans-web</artifactId>
<version>${project.version}</version>
</dependency>
-
- <!-- EL Plugin -->
+
+ <!-- EL Plugin -->
<dependency>
<groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-el10</artifactId>
+ <artifactId>openwebbeans-el22</artifactId>
<version>${project.version}</version>
</dependency>
@@ -93,9 +93,9 @@ under the License.
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
</dependency>
-
- <!-- JSR-250 API -->
- <dependency>
+
+ <!-- JSR-250 API -->
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.2_spec</artifactId>
</dependency>
@@ -116,12 +116,12 @@ under the License.
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${myfaces2.version}</version>
+ <version>${myfaces.version}</version>
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>${myfaces2.version}</version>
+ <version>${myfaces.version}</version>
</dependency>
Modified: openwebbeans/trunk/samples/jsf2sample/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/jsf2sample/pom.xml?rev=1758228&r1=1758227&r2=1758228&view=diff
==============================================================================
--- openwebbeans/trunk/samples/jsf2sample/pom.xml (original)
+++ openwebbeans/trunk/samples/jsf2sample/pom.xml Mon Aug 29 13:49:55 2016
@@ -74,14 +74,14 @@ under the License.
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-api</artifactId>
- <version>${myfaces2.version}</version>
+ <version>${myfaces.version}</version>
</dependency>
<!-- JSF Impl -->
<dependency>
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
- <version>${myfaces2.version}</version>
+ <version>${myfaces.version}</version>
</dependency>
<!-- JSR 299 API -->
@@ -95,9 +95,9 @@ under the License.
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
</dependency>
-
- <!-- JSR-250 API -->
- <dependency>
+
+ <!-- JSR-250 API -->
+ <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-annotation_1.2_spec</artifactId>
</dependency>
Modified: openwebbeans/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/pom.xml?rev=1758228&r1=1758227&r2=1758228&view=diff
==============================================================================
--- openwebbeans/trunk/samples/pom.xml (original)
+++ openwebbeans/trunk/samples/pom.xml Mon Aug 29 13:49:55 2016
@@ -33,7 +33,6 @@ under the License.
<properties>
<deploy.skip>false</deploy.skip>
- <myfaces2.version>2.2.8</myfaces2.version>
</properties>
<build>
@@ -41,11 +40,6 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat6-maven-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
<version>2.2</version>
</plugin>
@@ -112,7 +106,6 @@ under the License.
<module>conversation-sample</module>
<module>jsf2sample</module>
<module>reservation</module>
- <module>tomcat-sample</module>
<module>tomcat7-sample</module>
<module>standalone-sample</module>
</modules>
Modified: openwebbeans/trunk/samples/reservation/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/samples/reservation/pom.xml?rev=1758228&r1=1758227&r2=1758228&view=diff
==============================================================================
--- openwebbeans/trunk/samples/reservation/pom.xml (original)
+++ openwebbeans/trunk/samples/reservation/pom.xml Mon Aug 29 13:49:55 2016
@@ -132,7 +132,7 @@ under the License.
<dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>2.4.0</version>
+ <version>2.4.1</version>
<scope>runtime</scope>
</dependency>
@@ -162,9 +162,9 @@ under the License.
<finalName>reservation</finalName>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
- <version>1.2</version>
+ <version>2.4.1</version>
<configuration>
<includes>org/apache/webbeans/reservation/entity/*.class</includes>
<addDefaultConstructor>true</addDefaultConstructor>
Modified: openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/adaptor/ELAdaptor.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/adaptor/ELAdaptor.java?rev=1758228&r1=1758227&r2=1758228&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/adaptor/ELAdaptor.java (original)
+++ openwebbeans/trunk/webbeans-spi/src/main/java/org/apache/webbeans/spi/adaptor/ELAdaptor.java Mon Aug 29 13:49:55 2016
@@ -24,7 +24,8 @@ import javax.el.ExpressionFactory;
/**
* This SPI allows to separate ExpressionLanguage dependencies from OWB core.
* This is mainly needed to support different EL specification versions.
- * We currently support EL-2.2 in openwebbeans-impl natively and also provide a
+ * We currently support EL-2.2 in openwebbeans-impl natively.
+ * In older OWB versions we also provideed a
* pluggable implementation for EL-1.0 in our openwebbeans-el10 module.
*/
public interface ELAdaptor