From: <cat...@us...> - 2011-02-27 20:11:13
|
Revision: 14934 http://andromda.svn.sourceforge.net/andromda/?rev=14934&view=rev Author: catforce Date: 2011-02-27 20:11:07 +0000 (Sun, 27 Feb 2011) Log Message: ----------- update servlet-api und jsp-api dependencies Modified Paths: -------------- trunk/andromda-etc/andromda-taglibs/andromda-breadcrumbs-taglib/pom.xml trunk/andromda-etc/andromda-taglibs/andromda-collections-taglib/pom.xml trunk/andromda-etc/andromda-taglibs/andromda-formatting-taglib/pom.xml trunk/cartridges/andromda-jsf/components/pom.xml trunk/cartridges/andromda-jsf/components/src/main/java/org/andromda/cartridges/jsf/portlet/myfaces/tomahawk/support/ServletContextWrapper.java trunk/pom.xml Modified: trunk/andromda-etc/andromda-taglibs/andromda-breadcrumbs-taglib/pom.xml =================================================================== --- trunk/andromda-etc/andromda-taglibs/andromda-breadcrumbs-taglib/pom.xml 2011-02-27 18:04:19 UTC (rev 14933) +++ trunk/andromda-etc/andromda-taglibs/andromda-breadcrumbs-taglib/pom.xml 2011-02-27 20:11:07 UTC (rev 14934) @@ -17,10 +17,12 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> + <scope>provided</scope> </dependency> <dependency> - <groupId>javax.servlet</groupId> + <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> + <scope>provided</scope> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/andromda-etc/andromda-taglibs/andromda-collections-taglib/pom.xml =================================================================== --- trunk/andromda-etc/andromda-taglibs/andromda-collections-taglib/pom.xml 2011-02-27 18:04:19 UTC (rev 14933) +++ trunk/andromda-etc/andromda-taglibs/andromda-collections-taglib/pom.xml 2011-02-27 20:11:07 UTC (rev 14934) @@ -13,8 +13,9 @@ <description>This tag-library is used to more easily handle Collections in JSPs</description> <dependencies> <dependency> - <groupId>javax.servlet</groupId> + <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> + <scope>provided</scope> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/andromda-etc/andromda-taglibs/andromda-formatting-taglib/pom.xml =================================================================== --- trunk/andromda-etc/andromda-taglibs/andromda-formatting-taglib/pom.xml 2011-02-27 18:04:19 UTC (rev 14933) +++ trunk/andromda-etc/andromda-taglibs/andromda-formatting-taglib/pom.xml 2011-02-27 20:11:07 UTC (rev 14934) @@ -17,8 +17,9 @@ <artifactId>commons-lang</artifactId> </dependency> <dependency> - <groupId>javax.servlet</groupId> + <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> + <scope>provided</scope> </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/cartridges/andromda-jsf/components/pom.xml =================================================================== --- trunk/cartridges/andromda-jsf/components/pom.xml 2011-02-27 18:04:19 UTC (rev 14933) +++ trunk/cartridges/andromda-jsf/components/pom.xml 2011-02-27 20:11:07 UTC (rev 14934) @@ -76,10 +76,14 @@ </dependency> <!-- taglib dependencies --> <dependency> - <groupId>javax.servlet</groupId> + <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> - <version>2.0</version> <scope>provided</scope> - </dependency> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> </dependencies> </project> \ No newline at end of file Modified: trunk/cartridges/andromda-jsf/components/src/main/java/org/andromda/cartridges/jsf/portlet/myfaces/tomahawk/support/ServletContextWrapper.java =================================================================== --- trunk/cartridges/andromda-jsf/components/src/main/java/org/andromda/cartridges/jsf/portlet/myfaces/tomahawk/support/ServletContextWrapper.java 2011-02-27 18:04:19 UTC (rev 14933) +++ trunk/cartridges/andromda-jsf/components/src/main/java/org/andromda/cartridges/jsf/portlet/myfaces/tomahawk/support/ServletContextWrapper.java 2011-02-27 20:11:07 UTC (rev 14934) @@ -40,6 +40,17 @@ } /** + * @return null + * @see javax.servlet.http.HttpServletRequest#getContextPath() + * @since Servlet 2.5 + */ + @Override + public String getContextPath() { + // TODO Portlet API does not have this method + return null; + } + + /** * return null * @see javax.servlet.ServletContext#getContext(String) */ Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-27 18:04:19 UTC (rev 14933) +++ trunk/pom.xml 2011-02-27 20:11:07 UTC (rev 14934) @@ -317,15 +317,14 @@ <version>3.14.0-GA</version> </dependency> <dependency> - <groupId>javax.servlet</groupId> + <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> - <version>2.0</version> + <version>2.1</version> </dependency> - <!-- Update to 2.5 requires fixing cartridges/jsf/components servletContextwrapper to implement getContextPath() --> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.4</version> + <version>2.5</version> </dependency> <!-- Some dependencies, which can not be found in maven repository--> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |