Author: beaton
Date: Wed May 6 17:51:12 2009
New Revision: 772382
URL: http://svn.apache.org/viewvc?rev=772382&view=rev
Log:
Split JUEL implementation from javax.el interface for better compatibility
with servlet engines that ship their own javax.el jars.
Modified:
incubator/shindig/trunk/java/common/pom.xml
incubator/shindig/trunk/java/gadgets/pom.xml
incubator/shindig/trunk/java/server/pom.xml
incubator/shindig/trunk/java/social-api/pom.xml
incubator/shindig/trunk/pom.xml
Modified: incubator/shindig/trunk/java/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/pom.xml?rev=772382&r1=772381&r2=772382&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/pom.xml (original)
+++ incubator/shindig/trunk/java/common/pom.xml Wed May 6 17:51:12 2009
@@ -144,8 +144,13 @@
<artifactId>ehcache</artifactId>
</dependency>
<dependency>
- <groupId>de.odysseus.juel</groupId>
- <artifactId>juel</artifactId>
+ <groupId>juel</groupId>
+ <artifactId>juel-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>juel</groupId>
+ <artifactId>juel-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>net.sf.ezmorph</groupId>
Modified: incubator/shindig/trunk/java/gadgets/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/pom.xml?rev=772382&r1=772381&r2=772382&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/pom.xml (original)
+++ incubator/shindig/trunk/java/gadgets/pom.xml Wed May 6 17:51:12 2009
@@ -171,8 +171,13 @@
<artifactId>xml-apis</artifactId>
</dependency>
<dependency>
- <groupId>de.odysseus.juel</groupId>
- <artifactId>juel</artifactId>
+ <groupId>juel</groupId>
+ <artifactId>juel-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>juel</groupId>
+ <artifactId>juel-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
Modified: incubator/shindig/trunk/java/server/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/pom.xml?rev=772382&r1=772381&r2=772382&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/pom.xml (original)
+++ incubator/shindig/trunk/java/server/pom.xml Wed May 6 17:51:12 2009
@@ -175,6 +175,10 @@
<artifactId>htmlunit</artifactId>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>juel</groupId>
+ <artifactId>juel-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: incubator/shindig/trunk/java/social-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/pom.xml?rev=772382&r1=772381&r2=772382&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/pom.xml (original)
+++ incubator/shindig/trunk/java/social-api/pom.xml Wed May 6 17:51:12 2009
@@ -166,5 +166,10 @@
<artifactId>jetty</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>juel</groupId>
+ <artifactId>juel-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: incubator/shindig/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/pom.xml?rev=772382&r1=772381&r2=772382&view=diff
==============================================================================
--- incubator/shindig/trunk/pom.xml (original)
+++ incubator/shindig/trunk/pom.xml Wed May 6 17:51:12 2009
@@ -1175,6 +1175,10 @@
<url>http://download.java.net/maven/1</url>
<layout>legacy</layout>
</repository>
+ <repository>
+ <id>jboss</id>
+ <url>http://repository.jboss.com/maven2</url>
+ </repository>
</repositories>
<!-- ======================================================================
-->
@@ -1412,9 +1416,19 @@
<artifactId>sanselan</artifactId>
<version>0.97-incubator</version>
</dependency>
+ <!--
+ Intentionally not using the juel-impl RC build because we care about
+ stability of that code. juel-api only has an RC build available,
+ but is also simple enough I'm not too concerned about bugs.
+ -->
+ <dependency>
+ <groupId>juel</groupId>
+ <artifactId>juel-api</artifactId>
+ <version>2.1.1.RC2</version>
+ </dependency>
<dependency>
- <groupId>de.odysseus.juel</groupId>
- <artifactId>juel</artifactId>
+ <groupId>juel</groupId>
+ <artifactId>juel-impl</artifactId>
<version>2.1.0</version>
</dependency>
<dependency>
