Hi,
portal-driver uses internally spring 1.0.5. The causes some trouble since my
portal app uses the driver and requires itself Spring 1.2.5. There's a patch
attached solving this.
This patch also contains some weaker maven2 dependencies ("compile" ->
"provided") as well as some updated dependencies.
Regards
Stefan
Index: pluto-container/pom.xml
===================================================================
--- pluto-container/pom.xml (Revision 330559)
+++ pluto-container/pom.xml (Arbeitskopie)
@@ -21,7 +21,7 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.4</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>portlet-api</groupId>
Index: pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfigurationFactory.java
===================================================================
--- pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfigurationFactory.java (Revision 330559)
+++ pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfigurationFactory.java (Arbeitskopie)
@@ -15,13 +15,13 @@
*/
package org.apache.pluto.driver.config;
+import javax.servlet.ServletContext;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.xml.XmlBeanFactory;
+import org.springframework.web.context.support.ServletContextResource;
-import javax.servlet.ServletContext;
-import java.io.InputStream;
-
/**
* @author <a href="[EMAIL PROTECTED]">David H. DeWolf</a>
* @version 1.0
@@ -54,10 +54,9 @@
LOG.debug("Retrieving driver configuration from: "+DRIVER_CONFIG);
}
- InputStream in =
- context.getResourceAsStream(DRIVER_CONFIG);
+ ServletContextResource resource = new ServletContextResource(context, DRIVER_CONFIG);
- XmlBeanFactory beanFactory = new XmlBeanFactory(in);
+ XmlBeanFactory beanFactory = new XmlBeanFactory(resource);
DriverConfiguration configuration = (DriverConfiguration)
beanFactory.getBean("DriverConfiguration");
Index: pluto-portal-driver/pom.xml
===================================================================
--- pluto-portal-driver/pom.xml (Revision 330559)
+++ pluto-portal-driver/pom.xml (Arbeitskopie)
@@ -24,15 +24,9 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId>
<version>1.0.4</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>1.7</version>
@@ -58,22 +52,22 @@
</dependency>
<!-- We should use groupId 'javax.servlet' here, but there seems to have
some bugs in the jstl 1.1.2 artifact from the javax.servlet group. -->
- <dependency>
+ <!--<dependency>
<groupId>jstl</groupId>
<artifactId>jstl</artifactId>
<version>1.1.2</version>
- <scope>compile</scope>
- </dependency>
+ <scope>provided</scope>
+ </dependency>-->
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>1.0.4</version>
- <scope>compile</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>spring</groupId>
- <artifactId>spring-core</artifactId>
- <version>1.0.2</version>
+ <groupId>springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>1.2.5</version>
<scope>compile</scope>
</dependency>
</dependencies>
Index: maven-pluto-plugin/src/main/java/org/apache/pluto/maven/DeployMojo.java
===================================================================
--- maven-pluto-plugin/src/main/java/org/apache/pluto/maven/DeployMojo.java (Revision 330559)
+++ maven-pluto-plugin/src/main/java/org/apache/pluto/maven/DeployMojo.java (Arbeitskopie)
@@ -73,7 +73,7 @@
public DeploymentConfigImpl() {
super(deployment.getName().substring(0, deployment.getName().lastIndexOf(".")));
- props = new Properties(project.getProfileProperties());
+ props = new Properties(project.getProperties());
props.putAll(System.getProperties());
props.setProperty("tomcat.home", installationDirectory.getAbsolutePath());
props.setProperty("tomcat.service", tomcatService);
Index: maven-pluto-plugin/pom.xml
===================================================================
--- maven-pluto-plugin/pom.xml (Revision 330559)
+++ maven-pluto-plugin/pom.xml (Arbeitskopie)
@@ -13,7 +13,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>2.0-alpha-3</version>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.pluto</groupId>
@@ -24,22 +24,22 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0-alpha-3</version>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
- <version>2.0-alpha-3</version>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0-alpha-3</version>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0-alpha-3</version>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>marmalade</groupId>
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-script-marmalade</artifactId>
- <version>2.0-alpha-3</version>
+ <version>2.0-beta-2</version>
</dependency>
</dependencies>
