Author: apetrelli
Date: Tue Dec 11 12:48:27 2007
New Revision: 603355
URL: http://svn.apache.org/viewvc?rev=603355&view=rev
Log:
STR-3120
Now the Tiles 2 plugin builds against JDK 1.4.
Fixed the assembly too.
Modified:
struts/struts1/trunk/assembly/pom.xml
struts/struts1/trunk/assembly/src/main/assembly/all.xml
struts/struts1/trunk/assembly/src/main/assembly/lib.xml
struts/struts1/trunk/tiles2/pom.xml
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesRequestProcessor.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/DefinitionDispatcherAction.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/TilesAction.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/StrutsPreparerFactory.java
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/util/PlugInConfigContextAdapter.java
Modified: struts/struts1/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/assembly/pom.xml?rev=603355&r1=603354&r2=603355&view=diff
==============================================================================
--- struts/struts1/trunk/assembly/pom.xml (original)
+++ struts/struts1/trunk/assembly/pom.xml Tue Dec 11 12:48:27 2007
@@ -111,7 +111,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.2-beta-1</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/all.xml</descriptor>
@@ -169,6 +169,12 @@
<groupId>org.apache.struts</groupId>
<artifactId>struts-tiles2</artifactId>
<version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-jsp</artifactId>
+ <version>2.0.5</version>
+ <classifier>j4</classifier>
</dependency>
<dependency>
<groupId>org.apache.struts</groupId>
Modified: struts/struts1/trunk/assembly/src/main/assembly/all.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/assembly/src/main/assembly/all.xml?rev=603355&r1=603354&r2=603355&view=diff
==============================================================================
--- struts/struts1/trunk/assembly/src/main/assembly/all.xml (original)
+++ struts/struts1/trunk/assembly/src/main/assembly/all.xml Tue Dec 11 12:48:27
2007
@@ -25,6 +25,20 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<scope>runtime</scope>
+ <excludes>
+ <exclude>org.apache.tiles:tiles-api</exclude>
+ <exclude>org.apache.tiles:tiles-core</exclude>
+ <exclude>org.apache.tiles:tiles-jsp</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+
<outputFileNameMapping>${artifactId}-${version}-j4.${extension}</outputFileNameMapping>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>org.apache.tiles:tiles-api:jar:j4</include>
+ <include>org.apache.tiles:tiles-core:jar:j4</include>
+ <include>org.apache.tiles:tiles-jsp:jar:j4</include>
+ </includes>
</dependencySet>
</dependencySets>
<fileSets>
Modified: struts/struts1/trunk/assembly/src/main/assembly/lib.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/assembly/src/main/assembly/lib.xml?rev=603355&r1=603354&r2=603355&view=diff
==============================================================================
--- struts/struts1/trunk/assembly/src/main/assembly/lib.xml (original)
+++ struts/struts1/trunk/assembly/src/main/assembly/lib.xml Tue Dec 11 12:48:27
2007
@@ -26,6 +26,20 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<scope>runtime</scope>
+ <excludes>
+ <exclude>org.apache.tiles:tiles-api</exclude>
+ <exclude>org.apache.tiles:tiles-core</exclude>
+ <exclude>org.apache.tiles:tiles-jsp</exclude>
+ </excludes>
+ </dependencySet>
+ <dependencySet>
+
<outputFileNameMapping>${artifactId}-${version}-j4.${extension}</outputFileNameMapping>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>org.apache.tiles:tiles-api:jar:j4</include>
+ <include>org.apache.tiles:tiles-core:jar:j4</include>
+ <include>org.apache.tiles:tiles-jsp:jar:j4</include>
+ </includes>
</dependencySet>
</dependencySets>
<fileSets>
Modified: struts/struts1/trunk/tiles2/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/pom.xml?rev=603355&r1=603354&r2=603355&view=diff
==============================================================================
--- struts/struts1/trunk/tiles2/pom.xml (original)
+++ struts/struts1/trunk/tiles2/pom.xml Tue Dec 11 12:48:27 2007
@@ -49,18 +49,6 @@
</distributionManagement>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -110,6 +98,34 @@
<groupId>org.apache.tiles</groupId>
<artifactId>tiles-core</artifactId>
<version>2.0.5</version>
+ <classifier>j4</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-api</artifactId>
+ <version>2.0.5</version>
+ <classifier>j4</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.retrotranslator</groupId>
+ <artifactId>retrotranslator-runtime</artifactId>
+ <version>1.2.1</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ <version>3.0</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
Modified:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java?rev=603355&r1=603354&r2=603355&view=diff
==============================================================================
---
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java
(original)
+++
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesPlugin.java
Tue Dec 11 12:48:27 2007
@@ -86,15 +86,15 @@
* Defaults form Tiles 2 configuration in case of a module-aware
* configuration.
*/
- private static final Map < String, String > MODULE_AWARE_DEFAULTS =
- new HashMap < String, String > ();
+ private static final Map MODULE_AWARE_DEFAULTS =
+ new HashMap();
/**
* Defaults form Tiles 2 configuration in case of a configuration without
* modules.
*/
- private static final Map < String, String > NO_MODULE_DEFAULTS =
- new HashMap < String, String > ();
+ private static final Map NO_MODULE_DEFAULTS =
+ new HashMap();
static {
NO_MODULE_DEFAULTS.put(TilesContainerFactory
@@ -212,8 +212,7 @@
DefinitionsFactory defsFactory =
((KeyedDefinitionsFactoryTilesContainerFactory)
factory)
.createDefinitionsFactory(currentPlugInConfigContextAdapter);
- Map < String, String > initParameters =
- new HashMap < String, String > ();
+ Map initParameters = new HashMap();
String param = (String) currentPlugInConfigObject
.getProperties().get(BasicTilesContainer
.DEFINITIONS_CONFIG);
@@ -284,7 +283,7 @@
String configProcessorClassname = ctrlConfig.getProcessorClass();
// Check if specified classname exist
- Class < ? > configProcessorClass;
+ Class configProcessorClass;
try {
configProcessorClass =
RequestUtils.applicationClass(configProcessorClassname);
@@ -313,7 +312,7 @@
}
// Check if specified request processor is compatible with Tiles.
- Class < ? > tilesProcessorClass = TilesRequestProcessor.class;
+ Class tilesProcessorClass = TilesRequestProcessor.class;
if (!tilesProcessorClass.isAssignableFrom(configProcessorClass)) {
// Not compatible
String msg =
Modified:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesRequestProcessor.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesRequestProcessor.java?rev=603355&r1=603354&r2=603355&view=diff
==============================================================================
---
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesRequestProcessor.java
(original)
+++
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/TilesRequestProcessor.java
Tue Dec 11 12:48:27 2007
@@ -113,10 +113,12 @@
boolean retValue = false;
- if (container.isValidDefinition(definitionName, request, response)) {
+ if (container.isValidDefinition(definitionName, new Object[] { request,
+ response })) {
retValue = response.isCommitted();
try {
- container.render(definitionName, request, response);
+ container.render(definitionName, new Object[] { request,
+ response });
} catch (TilesException e) {
throw new ServletException("Cannot render definition '"
+ definitionName + "'");
Modified:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/DefinitionDispatcherAction.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/DefinitionDispatcherAction.java?rev=603355&r1=603354&r2=603355&view=diff
==============================================================================
---
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/DefinitionDispatcherAction.java
(original)
+++
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/DefinitionDispatcherAction.java
Tue Dec 11 12:48:27 2007
@@ -111,8 +111,9 @@
TilesContainer container = TilesAccess.getContainer(request
.getSession().getServletContext());
if (container != null
- && container.isValidDefinition(name, request, response)) {
- container.render(name, request, response);
+ && container.isValidDefinition(name, new Object[] { request,
+ response })) {
+ container.render(name, new Object[] { request, response });
} else {
log.error("Can't get definition '" + name + "'.");
return mapping.findForward("error");
Modified:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/TilesAction.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/TilesAction.java?rev=603355&r1=603354&r2=603355&view=diff
==============================================================================
---
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/TilesAction.java
(original)
+++
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/actions/TilesAction.java
Tue Dec 11 12:48:27 2007
@@ -67,8 +67,9 @@
throws Exception {
// Try to retrieve tile context
- AttributeContext context =
TilesAccess.getContainer(request.getSession()
- .getServletContext()).getAttributeContext(request, response);
+ AttributeContext context = TilesAccess.getContainer(
+ request.getSession().getServletContext()).getAttributeContext(
+ new Object[] { request, response });
if (context == null) {
throw new ServletException(
"Can't find Tile context for '"
Modified:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java?rev=603355&r1=603354&r2=603355&view=diff
==============================================================================
---
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java
(original)
+++
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/commands/TilesPreProcessor.java
Tue Dec 11 12:48:27 2007
@@ -104,10 +104,10 @@
return false;
}
- if (container.isValidDefinition(forwardConfig.getPath(),
- sacontext.getRequest(), sacontext.getResponse())) {
- container.render(forwardConfig.getPath(),
- sacontext.getRequest(), sacontext.getResponse());
+ if (container.isValidDefinition(forwardConfig.getPath(), new Object[] {
+ sacontext.getRequest(), sacontext.getResponse() })) {
+ container.render(forwardConfig.getPath(), new Object[] {
+ sacontext.getRequest(), sacontext.getResponse() });
sacontext.setForwardConfig(null);
} else {
// ignore not found
Modified:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/StrutsPreparerFactory.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/StrutsPreparerFactory.java?rev=603355&r1=603354&r2=603355&view=diff
==============================================================================
---
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/StrutsPreparerFactory.java
(original)
+++
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/preparer/StrutsPreparerFactory.java
Tue Dec 11 12:48:27 2007
@@ -35,7 +35,6 @@
public class StrutsPreparerFactory extends BasicPreparerFactory {
/** [EMAIL PROTECTED] */
- @Override
protected ViewPreparer createPreparer(String name) throws TilesException {
ViewPreparer retValue;
Modified:
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/util/PlugInConfigContextAdapter.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/util/PlugInConfigContextAdapter.java?rev=603355&r1=603354&r2=603355&view=diff
==============================================================================
---
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/util/PlugInConfigContextAdapter.java
(original)
+++
struts/struts1/trunk/tiles2/src/main/java/org/apache/struts/tiles2/util/PlugInConfigContextAdapter.java
Tue Dec 11 12:48:27 2007
@@ -56,7 +56,7 @@
/**
* The set of all parameter names.
*/
- private Set < String > parameterNames;
+ private Set parameterNames;
/**
* Constructor.
@@ -64,12 +64,11 @@
* @param plugInConfigObject The plugin config object to use.
* @param servletContext The servlet context to use.
*/
- @SuppressWarnings("unchecked")
public PlugInConfigContextAdapter(PlugInConfig plugInConfigObject,
ServletContext servletContext) {
this.plugInConfigObject = plugInConfigObject;
this.rootContext = servletContext;
- parameterNames = new LinkedHashSet < String > ();
+ parameterNames = new LinkedHashSet();
parameterNames.addAll(this.plugInConfigObject.getProperties().keySet());
CollectionUtils.addAll(parameterNames, this.rootContext
.getInitParameterNames());
@@ -98,7 +97,6 @@
*
* @return The names of all initialization parameters.
*/
- @SuppressWarnings("unchecked")
public Enumeration getInitParameterNames() {
return new IteratorEnumeration(parameterNames.iterator());
}
@@ -126,7 +124,6 @@
}
/** [EMAIL PROTECTED] */
- @SuppressWarnings("unchecked")
public Set getResourcePaths(String string) {
return rootContext.getResourcePaths(string);
}
@@ -152,19 +149,16 @@
}
/** [EMAIL PROTECTED] */
- @SuppressWarnings("deprecation")
public Servlet getServlet(String string) throws ServletException {
return rootContext.getServlet(string);
}
/** [EMAIL PROTECTED] */
- @SuppressWarnings({ "deprecation", "unchecked" })
public Enumeration getServlets() {
return rootContext.getServlets();
}
/** [EMAIL PROTECTED] */
- @SuppressWarnings({ "deprecation", "unchecked" })
public Enumeration getServletNames() {
return rootContext.getServletNames();
}
@@ -175,7 +169,6 @@
}
/** [EMAIL PROTECTED] */
- @SuppressWarnings("deprecation")
public void log(Exception exception, String string) {
rootContext.log(exception, string);
}
@@ -201,7 +194,6 @@
}
/** [EMAIL PROTECTED] */
- @SuppressWarnings("unchecked")
public Enumeration getAttributeNames() {
return rootContext.getAttributeNames();
}
