You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2007/06/20 23:06:11 UTC
svn commit: r549235 - in /tapestry/tapestry4/trunk: pom.xml
tapestry-framework/src/java/org/apache/tapestry/services/impl/RequestCycleFactoryImpl.java
Author: jkuhnert
Date: Wed Jun 20 14:06:10 2007
New Revision: 549235
URL: http://svn.apache.org/viewvc?view=rev&rev=549235
Log:
Tried to remove as many snapshot repo dependencies as possible. Minor code formatting.
Modified:
tapestry/tapestry4/trunk/pom.xml
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/RequestCycleFactoryImpl.java
Modified: tapestry/tapestry4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/pom.xml?view=diff&rev=549235&r1=549234&r2=549235
==============================================================================
--- tapestry/tapestry4/trunk/pom.xml (original)
+++ tapestry/tapestry4/trunk/pom.xml Wed Jun 20 14:06:10 2007
@@ -262,7 +262,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>2.0.2</version>
<inherited>true</inherited>
<configuration>
<source>1.4</source>
@@ -284,71 +284,19 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.0.2-SNAPSHOT</version>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0-alpha-1-SNAPSHOT</version>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.0.2-SNAPSHOT</version>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.3-SNAPSHOT</version>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.3-SNAPSHOT</version>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.2-SNAPSHOT</version>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.1.1</version>
<inherited>true</inherited>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>2.0-beta-5</version>
- <!--version>2.0-SNAPSHOT</version-->
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-5-SNAPSHOT</version>
- <configuration>
- <tagBase>https://svn.apache.org/repos/asf/tapestry/tapestry4/tags/</tagBase>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-repository-plugin</artifactId>
- <version>2.1-SNAPSHOT</version>
<inherited>true</inherited>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-SNAPSHOT</version>
<inherited>true</inherited>
<configuration>
<descriptors>
@@ -357,12 +305,6 @@
</descriptors>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.2-SNAPSHOT</version>
- <inherited>true</inherited>
- </plugin>
</plugins>
</pluginManagement>
</build>
@@ -383,7 +325,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <version>2.0.1</version>
<inherited>true</inherited>
<reportSets>
<reportSet>
@@ -406,7 +348,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2-SNAPSHOT</version>
+ <version>2.2</version>
<configuration>
<linksource>true</linksource>
<aggregate>true</aggregate>
@@ -435,18 +377,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-beta-5</version>
<inherited>true</inherited>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.2-SNAPSHOT</version>
- <inherited>true</inherited>
- <configuration>
- <configLocation>tapestry-checkstyle.xml</configLocation>
- </configuration>
- </plugin>
</plugins>
</reporting>
@@ -471,32 +404,21 @@
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
</repository>
<repository>
- <id>tapestry.javaforge</id>
- <url>http://howardlewisship.com/repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
+ <id>opencomponentry.com</id>
+ <name>Open Componentry OGNL Repository</name>
+ <url>http://opencomponentry.com/repository/m2-snapshot-repo</url>
</repository>
<repository>
<id>openqa</id>
<name>OpenQA Maven Repository</name>
<url>http://maven.openqa.org/</url>
</repository>
- <repository>
- <id>opencomponentry.com</id>
- <name>Open Componentry OGNL Repository</name>
- <url>http://opencomponentry.com/repository/m2-snapshot-repo</url>
- </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>apache.snapshots</id>
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
- </pluginRepository>
- <pluginRepository>
- <id>codehaus.org</id>
- <url>http://snapshots.repository.codehaus.org</url>
</pluginRepository>
<pluginRepository>
<id>codehaus.org</id>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/RequestCycleFactoryImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/RequestCycleFactoryImpl.java?view=diff&rev=549235&r1=549234&r2=549235
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/RequestCycleFactoryImpl.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/services/impl/RequestCycleFactoryImpl.java Wed Jun 20 14:06:10 2007
@@ -14,9 +14,6 @@
package org.apache.tapestry.services.impl;
-import java.io.IOException;
-import java.util.Iterator;
-
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.ErrorHandler;
import org.apache.tapestry.IEngine;
@@ -27,15 +24,13 @@
import org.apache.tapestry.engine.ServiceEncoder;
import org.apache.tapestry.engine.ServiceEncodingImpl;
import org.apache.tapestry.record.PropertyPersistenceStrategySource;
-import org.apache.tapestry.services.AbsoluteURLBuilder;
-import org.apache.tapestry.services.Infrastructure;
-import org.apache.tapestry.services.RequestCycleFactory;
-import org.apache.tapestry.services.RequestGlobals;
-import org.apache.tapestry.services.ResponseDelegateFactory;
-import org.apache.tapestry.services.ServiceConstants;
+import org.apache.tapestry.services.*;
import org.apache.tapestry.util.QueryParameterMap;
import org.apache.tapestry.web.WebRequest;
+import java.io.IOException;
+import java.util.Iterator;
+
/**
* Service that creates instances of {@link org.apache.tapestry.IRequestCycle}on behalf of an
* engine.
@@ -103,7 +98,7 @@
/**
* Constructs a {@link org.apache.tapestry.util.QueryParameterMap}using the parameters
- * available from the {@link org.apache.tapestry.request.RequestContext} (but ignoring any
+ * available from the {@link WebRequest} (but ignoring any
* file upload parameters!).
*/