Author: mrdon
Date: Sat Jul 1 16:43:57 2006
New Revision: 418525
URL: http://svn.apache.org/viewvc?rev=418525&view=rev
Log:
Renaming org.apache.struts.action2 to org.apache.struts2 in extras
WW-1367
Added:
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/
- copied from r418510,
struts/struts2/trunk/extras/src/main/java/org/apache/struts/action2/
struts/struts2/trunk/extras/src/test/java/org/apache/struts2/
- copied from r418510,
struts/struts2/trunk/extras/src/test/java/org/apache/struts/action2/
Removed:
struts/struts2/trunk/extras/src/main/java/org/apache/struts/
struts/struts2/trunk/extras/src/test/java/org/apache/struts/
Modified:
struts/struts2/trunk/extras/pom.xml
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/ChartResult.java
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/CompileReport.java
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/JasperReportConstants.java
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/OgnlValueStackDataSource.java
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/OgnlValueStackShadowMap.java
struts/struts2/trunk/extras/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java
Modified: struts/struts2/trunk/extras/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/extras/pom.xml?rev=418525&r1=418524&r2=418525&view=diff
==============================================================================
--- struts/struts2/trunk/extras/pom.xml (original)
+++ struts/struts2/trunk/extras/pom.xml Sat Jul 1 16:43:57 2006
@@ -3,11 +3,11 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.struts.action2</groupId>
- <artifactId>struts-action2-parent</artifactId>
+ <groupId>org.apache.struts2</groupId>
+ <artifactId>struts2-parent</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.struts.action2</groupId>
+ <groupId>org.apache.struts2</groupId>
<artifactId>struts-extras</artifactId>
<packaging>jar</packaging>
<name>Struts Extras</name>
@@ -15,7 +15,7 @@
<distributionManagement>
<site>
<id>apache-site</id>
-
<url>scp://people.apache.org/www/struts.apache.org/struts-action2/struts-extras</url>
+
<url>scp://people.apache.org/www/struts.apache.org/struts2/struts-extras</url>
</site>
</distributionManagement>
@@ -29,7 +29,7 @@
</dependency>
<dependency>
- <groupId>org.apache.struts.action2</groupId>
+ <groupId>org.apache.struts2</groupId>
<artifactId>struts-core</artifactId>
<version>${pom.version}</version>
</dependency>
Modified:
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/ChartResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/ChartResult.java?rev=418525&r1=418510&r2=418525&view=diff
==============================================================================
---
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/ChartResult.java
(original)
+++
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/ChartResult.java
Sat Jul 1 16:43:57 2006
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts2.dispatcher;
-import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts2.ServletActionContext;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.Result;
import org.jfree.chart.ChartUtilities;
Modified:
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java?rev=418525&r1=418510&r2=418525&view=diff
==============================================================================
---
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java
(original)
+++
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/dispatcher/multipart/PellMultiPartRequest.java
Sat Jul 1 16:43:57 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.dispatcher.multipart;
+package org.apache.struts2.dispatcher.multipart;
-import org.apache.struts.action2.config.Configuration;
-import org.apache.struts.action2.StrutsConstants;
+import org.apache.struts2.config.Configuration;
+import org.apache.struts2.StrutsConstants;
import http.utils.multipartrequest.ServletMultipartRequest;
import javax.servlet.http.HttpServletRequest;
Modified:
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/CompileReport.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/CompileReport.java?rev=418525&r1=418510&r2=418525&view=diff
==============================================================================
---
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/CompileReport.java
(original)
+++
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/CompileReport.java
Sat Jul 1 16:43:57 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.jasperreports;
+package org.apache.struts2.views.jasperreports;
import net.sf.jasperreports.engine.JRException;
import net.sf.jasperreports.engine.JasperCompileManager;
Modified:
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/JasperReportConstants.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/JasperReportConstants.java?rev=418525&r1=418510&r2=418525&view=diff
==============================================================================
---
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/JasperReportConstants.java
(original)
+++
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/JasperReportConstants.java
Sat Jul 1 16:43:57 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.jasperreports;
+package org.apache.struts2.views.jasperreports;
/**
Modified:
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java?rev=418525&r1=418510&r2=418525&view=diff
==============================================================================
---
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
(original)
+++
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java
Sat Jul 1 16:43:57 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.jasperreports;
+package org.apache.struts2.views.jasperreports;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -42,8 +42,8 @@
import org.apache.commons.logging.LogFactory;
import com.opensymphony.util.TextUtils;
-import org.apache.struts.action2.ServletActionContext;
-import org.apache.struts.action2.dispatcher.StrutsResultSupport;
+import org.apache.struts2.ServletActionContext;
+import org.apache.struts2.dispatcher.StrutsResultSupport;
import com.opensymphony.xwork.ActionInvocation;
import com.opensymphony.xwork.util.OgnlValueStack;
Modified:
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/OgnlValueStackDataSource.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/OgnlValueStackDataSource.java?rev=418525&r1=418510&r2=418525&view=diff
==============================================================================
---
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/OgnlValueStackDataSource.java
(original)
+++
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/OgnlValueStackDataSource.java
Sat Jul 1 16:43:57 2006
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.jasperreports;
+package org.apache.struts2.views.jasperreports;
-import org.apache.struts.action2.util.MakeIterator;
+import org.apache.struts2.util.MakeIterator;
import com.opensymphony.xwork.util.OgnlValueStack;
import net.sf.jasperreports.engine.JRDataSource;
import net.sf.jasperreports.engine.JRException;
Modified:
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/OgnlValueStackShadowMap.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/OgnlValueStackShadowMap.java?rev=418525&r1=418510&r2=418525&view=diff
==============================================================================
---
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/OgnlValueStackShadowMap.java
(original)
+++
struts/struts2/trunk/extras/src/main/java/org/apache/struts2/views/jasperreports/OgnlValueStackShadowMap.java
Sat Jul 1 16:43:57 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.views.jasperreports;
+package org.apache.struts2.views.jasperreports;
import com.opensymphony.xwork.util.OgnlValueStack;
Modified:
struts/struts2/trunk/extras/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/extras/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java?rev=418525&r1=418510&r2=418525&view=diff
==============================================================================
---
struts/struts2/trunk/extras/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java
(original)
+++
struts/struts2/trunk/extras/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java
Sat Jul 1 16:43:57 2006
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.struts.action2.dispatcher;
+package org.apache.struts2.dispatcher;
import com.mockobjects.dynamic.Mock;
-import org.apache.struts.action2.ServletActionContext;
+import org.apache.struts2.ServletActionContext;
import com.opensymphony.xwork.ActionContext;
import com.opensymphony.xwork.ActionInvocation;
import junit.framework.TestCase;
