Paul, all of this is for a post-2.0 release, right? -Donald
[EMAIL PROTECTED] wrote:
Author: pmcmahan Date: Mon Jun 25 14:22:36 2007 New Revision: 550613 URL: http://svn.apache.org/viewvc?view=rev&rev=550613 Log: move pluto-driver's spring dependency to pluto-container. this gives portal webapps access to the pluto-driver's spring context, or they can use a hidden-classes filter if they want to use their own private copy of spring Modified: geronimo/sandbox/portals/pluto-container/pom.xml geronimo/sandbox/portals/pluto-container/src/main/resources/META-INF/geronimo-plugin.xml geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml geronimo/sandbox/portals/pom.xml Modified: geronimo/sandbox/portals/pluto-container/pom.xml URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-container/pom.xml?view=diff&rev=550613&r1=550612&r2=550613 ============================================================================== --- geronimo/sandbox/portals/pluto-container/pom.xml (original) +++ geronimo/sandbox/portals/pluto-container/pom.xml Mon Jun 25 14:22:36 2007 @@ -76,6 +76,26 @@ <artifactId>pluto-taglib</artifactId> </dependency>+ <dependency>+ <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + </dependency> + </dependencies><build>Modified: geronimo/sandbox/portals/pluto-container/src/main/resources/META-INF/geronimo-plugin.xml URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-container/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=550613&r1=550612&r2=550613 ============================================================================== --- geronimo/sandbox/portals/pluto-container/src/main/resources/META-INF/geronimo-plugin.xml (original) +++ geronimo/sandbox/portals/pluto-container/src/main/resources/META-INF/geronimo-plugin.xml Mon Jun 25 14:22:36 2007 @@ -45,6 +45,10 @@ <dependency>javax.portlet/portlet-api/1.0/jar</dependency> <dependency>org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.1-SNAPSHOT/jar</dependency> <dependency>org.codehaus.castor/castor/1.1.1/jar</dependency> + <dependency>org.springframework/spring-beans/2.0.2/jar</dependency> + <dependency>org.springframework/spring-context/2.0.2/jar</dependency> + <dependency>org.springframework/spring-core/2.0.2/jar</dependency> + <dependency>org.springframework/spring-web/2.0.2/jar</dependency> <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository> <source-repository>http://repo1.maven.org/maven2/</source-repository> <source-repository>http://www.ibiblio.org/maven2/</source-repository> Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=550613&r1=550612&r2=550613 ============================================================================== --- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml (original) +++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml Mon Jun 25 14:22:36 2007 @@ -40,16 +40,7 @@ <dep:type>car</dep:type> </dep:dependency> </dep:dependencies> - <dep:hidden-classes> - <filter>org.springframework</filter> - <!-- the cxf and axis deployers automatically add dependencies - onto the cxf and axis modules. This causes spring to - not work correctly. these filters prevents spring from - from seeing the classes that would otherwise have been - found in this webapps parent classloader --> - <filter>org.apache.cxf</filter> - <filter>org.apache.axis</filter> - </dep:hidden-classes> + <dep:hidden-classes/> <dep:non-overridable-classes/> </dep:environment>Modified: geronimo/sandbox/portals/pom.xml URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pom.xml?view=diff&rev=550613&r1=550612&r2=550613 ============================================================================== --- geronimo/sandbox/portals/pom.xml (original) +++ geronimo/sandbox/portals/pom.xml Mon Jun 25 14:22:36 2007 @@ -58,6 +58,7 @@ <geronimoVersion>2.0-SNAPSHOT</geronimoVersion> <junitVersion>3.8.2</junitVersion> <plutoVersion>1.2.0-SNAPSHOT</plutoVersion> + <springVersion>2.0.2</springVersion> </properties><dependencyManagement>@@ -92,6 +93,26 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </exclusion> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + </exclusion> </exclusions> </dependency>@@ -124,6 +145,22 @@<groupId>junit</groupId> <artifactId>junit</artifactId> </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + </exclusion> </exclusions> </dependency>@@ -216,6 +253,30 @@<groupId>dwr</groupId> <artifactId>dwr</artifactId> <version>1.1.3</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>${springVersion}</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${springVersion}</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${springVersion}</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>${springVersion}</version> </dependency></dependencies>
smime.p7s
Description: S/MIME Cryptographic Signature
