Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 07:37:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-1789, WW-2279 Update velocity to 1.5, velocity-tools to 1.3, and Spring to 2.0.7. Apply one-line change to VelocityManager suggested by Rod Vagg.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@590528 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ted Nathan Husted
2007-10-31 01:24:43 +00:00
parent e43579f6f9
commit 8c2dfbd367
14 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/blank/pom.xml
+1 -1
View File
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>2.0.1</version>
<version>2.0.7</version>
<scope>test</scope>
</dependency>
apps/pom.xml
+1 -1
View File
@@ -192,7 +192,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<version>2.0.1</version>
<version>2.0.7</version>
<scope>test</scope>
</dependency>
</dependencies>
apps/portlet/pom.xml
+2 -2
View File
@@ -96,13 +96,13 @@
<dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.4</version>
<version>1.5</version>
</dependency>
<dependency>
<groupId>velocity-tools</groupId>
<artifactId>velocity-tools</artifactId>
<version>1.1</version>
<version>1.3</version>
</dependency>
<dependency>
<groupId>commons-digester</groupId>
apps/showcase/pom.xml
+2 -2
View File
@@ -120,13 +120,13 @@
<dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.4</version>
<version>1.5</version>
</dependency>
<dependency>
<groupId>velocity-tools</groupId>
<artifactId>velocity-tools</artifactId>
<version>1.1</version>
<version>1.3</version>
</dependency>
assembly/pom.xml
+7 -7
View File
@@ -258,14 +258,14 @@
<dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.4</version>
<version>1.5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>velocity-tools</groupId>
<artifactId>velocity-tools</artifactId>
<version>1.1</version>
<version>1.3</version>
<scope>provided</scope>
</dependency>
@@ -391,35 +391,35 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>1.2.8</version>
<version>2.0.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>1.2.8</version>
<version>2.0.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>1.2.8</version>
<version>2.0.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>1.2.8</version>
<version>2.0.7</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<version>1.2.8</version>
<version>2.0.7</version>
<scope>provided</scope>
</dependency>
core/pom.xml
+4 -4
View File
@@ -338,14 +338,14 @@
<dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.4</version>
<version>1.5</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>velocity-tools</groupId>
<artifactId>velocity-tools</artifactId>
<version>1.1</version>
<version>1.3</version>
<optional>true</optional>
</dependency>
@@ -374,14 +374,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<version>1.2.8</version>
<version>2.0.7</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>1.2.8</version>
<version>2.0.7</version>
<scope>test</scope>
</dependency>
core/src/main/java/org/apache/struts2/views/velocity/VelocityManager.java
+6 -6
View File
@@ -96,17 +96,17 @@ public class VelocityManager {
private Properties velocityProperties;
private String customConfigFile;
private List<TagLibrary> tagLibraries;
public VelocityManager() {
}
@Inject
public void setObjectFactory(ObjectFactory fac) {
this.objectFactory = fac;
}
@Inject
public void setContainer(Container container) {
List<TagLibrary> list = new ArrayList<TagLibrary>();
@@ -190,7 +190,7 @@ public class VelocityManager {
if (toolboxManager != null && ctx != null) {
ChainedContext chained = new ChainedContext(context, req, res, ctx);
chained.setToolbox(toolboxManager.getToolboxContext(chained));
chained.setToolbox(toolboxManager.getToolbox(chained));
return chained;
} else {
return context;
@@ -539,7 +539,7 @@ public class VelocityManager {
// components
StringBuffer sb = new StringBuffer();
for (TagLibrary tagLibrary : tagLibraries) {
List<Class> directives = tagLibrary.getVelocityDirectiveClasses();
for (Class directive : directives) {
plugins/codebehind/pom.xml
+2 -2
View File
@@ -56,13 +56,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<version>1.2.8</version>
<version>2.0.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>1.2.8</version>
<version>2.0.7</version>
<scope>test</scope>
</dependency>
<dependency>
plugins/dojo/pom.xml
+3 -3
View File
@@ -102,7 +102,7 @@
<dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.4</version>
<version>1.5</version>
<optional>true</optional>
</dependency>
@@ -196,14 +196,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<version>1.2.8</version>
<version>2.0.7</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>1.2.8</version>
<version>2.0.7</version>
<scope>test</scope>
</dependency>
plugins/portlet/pom.xml
+26 -26
View File
@@ -1,26 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/*
* $Id: pom.xml 559206 2007-07-24 21:01:18Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
-->
<!--
/*
* $Id: pom.xml 559206 2007-07-24 21:01:18Z apetrelli $
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* 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">
<modelVersion>4.0.0</modelVersion>
@@ -59,14 +59,14 @@
<dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.4</version>
<version>1.5</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>velocity-tools</groupId>
<artifactId>velocity-tools</artifactId>
<version>1.1</version>
<version>1.3</version>
<optional>true</optional>
</dependency>
@@ -123,13 +123,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<version>2.0.6</version>
<version>2.0.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>2.0.6</version>
<version>2.0.7</version>
<scope>test</scope>
</dependency>
</dependencies>
plugins/sitegraph/pom.xml
+2 -2
View File
@@ -148,7 +148,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>1.2.8</version>
<version>2.0.7</version>
<scope>test</scope>
</dependency>
@@ -156,7 +156,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<version>1.2.8</version>
<version>2.0.7</version>
<scope>test</scope>
</dependency>
plugins/sitemesh/pom.xml
+2 -2
View File
@@ -50,14 +50,14 @@
<dependency>
<groupId>velocity</groupId>
<artifactId>velocity</artifactId>
<version>1.4</version>
<version>1.5</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>velocity-tools</groupId>
<artifactId>velocity-tools</artifactId>
<version>1.1</version>
<version>1.3</version>
<optional>true</optional>
</dependency>
plugins/spring/pom.xml
+5 -5
View File
@@ -44,31 +44,31 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>2.0.1</version>
<version>2.0.7</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>2.0.1</version>
<version>2.0.7</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>2.0.1</version>
<version>2.0.7</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>2.0.1</version>
<version>2.0.7</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<version>2.0.1</version>
<version>2.0.7</version>
<scope>test</scope>
</dependency>
plugins/struts1/pom.xml
+2 -2
View File
@@ -58,14 +58,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<version>1.2.8</version>
<version>2.0.7</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>1.2.8</version>
<version>2.0.7</version>
<scope>test</scope>
</dependency>