struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mr...@apache.org
Subject svn commit: r419812 - in /struts/struts2/trunk: api/ apps/blank/src/main/webapp/WEB-INF/pages/ apps/portlet/src/main/webapp/WEB-INF/ apps/shopping-cart/src/main/webapp/ apps/shopping-cart/src/main/webapp/WEB-INF/decorators/ core/ core/src/main/java/org...
Date Fri, 07 Jul 2006 05:43:57 GMT
Author: mrdon
Date: Thu Jul  6 22:43:56 2006
New Revision: 419812

URL: http://svn.apache.org/viewvc?rev=419812&view=rev
Log:
Fixing a few more webwork renamings
WW-1344

Modified:
    struts/struts2/trunk/api/pom.xml
    struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/pages/home.jsp
    struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml
    struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/decorators/main.jsp
    struts/struts2/trunk/apps/shopping-cart/src/main/webapp/category.jsp
    struts/struts2/trunk/core/pom.xml
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
    struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
    struts/struts2/trunk/core/src/main/resources/org/apache/struts2/views/jsp/iterator/package.html

Modified: struts/struts2/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/api/pom.xml?rev=419812&r1=419811&r2=419812&view=diff
==============================================================================
--- struts/struts2/trunk/api/pom.xml (original)
+++ struts/struts2/trunk/api/pom.xml Thu Jul  6 22:43:56 2006
@@ -22,7 +22,7 @@
             <artifactId>junit</artifactId>
             <version>3.8.1</version>
             <scope>test</scope>
-            <!-- has to be compile for WebWorkTestCase, which is part of the base package
so others can write unit tests -->
+            <!-- has to be compile for StrutsTestCase, which is part of the base package
so others can write unit tests -->
             <optional>true</optional>
         </dependency>            
         <dependency>

Modified: struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/pages/home.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/pages/home.jsp?rev=419812&r1=419811&r2=419812&view=diff
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/pages/home.jsp (original)
+++ struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/pages/home.jsp Thu Jul  6 22:43:56
2006
@@ -5,6 +5,6 @@
         <title>Welcome</title>
     </head>
     <body>
-        <h1>Webwork is up and running...</h1>
+        <h1>Struts is up and running...</h1>
     </body>
 </html>

Modified: struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml?rev=419812&r1=419811&r2=419812&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml (original)
+++ struts/struts2/trunk/apps/portlet/src/main/webapp/WEB-INF/web.xml Thu Jul  6 22:43:56
2006
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app id="WebWorkPortlet">
+<web-app id="StrutsPortlet">
 	<!-- Uncomment/comment this if you need/don't need Spring support -->
 	<context-param>
 		<param-name>contextConfigLocation</param-name>

Modified: struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/decorators/main.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/decorators/main.jsp?rev=419812&r1=419811&r2=419812&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/decorators/main.jsp (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/webapp/WEB-INF/decorators/main.jsp Thu
Jul  6 22:43:56 2006
@@ -48,7 +48,7 @@
     <div id="outer-header">
         <div id="header" class="clearfix">
             <div id="branding">
-                <h1 class="title">WebWork Ajax</h1>
+                <h1 class="title">Struts Ajax</h1>
             </div><!-- end branding -->
 
             <div id="search">

Modified: struts/struts2/trunk/apps/shopping-cart/src/main/webapp/category.jsp
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/shopping-cart/src/main/webapp/category.jsp?rev=419812&r1=419811&r2=419812&view=diff
==============================================================================
--- struts/struts2/trunk/apps/shopping-cart/src/main/webapp/category.jsp (original)
+++ struts/struts2/trunk/apps/shopping-cart/src/main/webapp/category.jsp Thu Jul  6 22:43:56
2006
@@ -42,7 +42,7 @@
     </saf:else>
 </saf:if>
 <saf:else>
-    <h2>WebWork Ajax Catalog</h2>
+    <h2>Struts Ajax Catalog</h2>
 
     <p>Please choose a category to start shopping.</p>
 </saf:else>

Modified: struts/struts2/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?rev=419812&r1=419811&r2=419812&view=diff
==============================================================================
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Thu Jul  6 22:43:56 2006
@@ -266,7 +266,7 @@
             <artifactId>junit</artifactId>
             <scope>compile</scope>
             <version>3.8.1</version>
-            <!-- has to be compile for WebWorkTestCase, which is part of the base package
so others can write unit tests -->
+            <!-- has to be compile for StrutsTestCase, which is part of the base package
so others can write unit tests -->
             <optional>true</optional>
         </dependency>
 

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java?rev=419812&r1=419811&r2=419812&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java
(original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/plexus/PlexusObjectFactory.java
Thu Jul  6 22:43:56 2006
@@ -269,7 +269,7 @@
             return pc.lookup(role, roleHint);
         }
         catch (Exception e) {
-            log.debug("Can't load component (" + role + "/" + roleHint + ") with plexus,
try now with webwork.", e);
+            log.debug("Can't load component (" + role + "/" + roleHint + ") with plexus,
try now with struts.", e);
             Object o = super.buildBean(super.getClassInstance(role), extraContext);
             pc.autowire(o);
             return o;

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java?rev=419812&r1=419811&r2=419812&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
(original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java
Thu Jul  6 22:43:56 2006
@@ -78,7 +78,7 @@
  * <ol>
  *   <li>path defined in ServletContext init parameter named 'templatePath' or 'TemplatePath'
(must be an absolute path)</li>
  *   <li>webapp classpath</li>
- *   <li>webwork's static folder (under [WEBWORK_SOURCE]/com/opensymphony/webwork/static/</li>
+ *   <li>struts's static folder (under [WEBWORK_SOURCE]/org/apache/struts2/static/</li>
  * </ol>
  * <p/>
  *

Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties?rev=419812&r1=419811&r2=419812&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties (original)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/default.properties Thu
Jul  6 22:43:56 2006
@@ -45,7 +45,7 @@
 struts.multipart.maxSize=2097152
 
 ### Load custom property files (does not override struts.properties!)
-# struts.custom.properties=application,com/webwork/extension/custom
+# struts.custom.properties=application,org/apache/struts2/extension/custom
 
 ### How request URLs are mapped to and from actions
 struts.mapper.class=org.apache.struts2.dispatcher.mapper.DefaultActionMapper

Modified: struts/struts2/trunk/core/src/main/resources/org/apache/struts2/views/jsp/iterator/package.html
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/org/apache/struts2/views/jsp/iterator/package.html?rev=419812&r1=419811&r2=419812&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/org/apache/struts2/views/jsp/iterator/package.html
(original)
+++ struts/struts2/trunk/core/src/main/resources/org/apache/struts2/views/jsp/iterator/package.html
Thu Jul  6 22:43:56 2006
@@ -1 +1 @@
-<body>Webwork's JSP tag library for iterator handling.</body>
+<body>Struts's JSP tag library for iterator handling.</body>



Mime
View raw message