Author: tmjee
Date: Sun Sep 3 22:35:34 2006
New Revision: 439936
URL: http://svn.apache.org/viewvc?view=rev&rev=439936
Log:
- renamed ${groupId} to ${package} such that -DpackageName argument will take
effect
- removed resources not required (src/test/resources/com/*) since the package
in resource can't be change dynamically, there's no point to have it there.
Added:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/resources/test.properties
Removed:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/resources/com/
Modified:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/HelloWorldAction.java
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/IndexAction.java
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/HelloWorldActionTest.java
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/IndexActionTest.java
Modified:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml?view=diff&rev=439936&r1=439935&r2=439936
==============================================================================
---
struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
(original)
+++
struts/maven/trunk/struts2-archetype-starter/src/main/resources/META-INF/archetype.xml
Sun Sep 3 22:35:34 2006
@@ -47,7 +47,7 @@
<source>src/test/java/IndexActionTest.java</source>
</testSources>
<testResources>
-
<resource>src/test/resources/com/myComp/myApp/HelloWorldActionTest.properties</resource>
+ <resource>src/test/resources/test.properties</resource>
</testResources>
</archetype>
Modified:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java?view=diff&rev=439936&r1=439935&r2=439936
==============================================================================
---
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java
(original)
+++
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java
Sun Sep 3 22:35:34 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package ${groupId};
+package ${package};
import org.apache.struts2.util.StrutsTypeConverter;
Modified:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/HelloWorldAction.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/HelloWorldAction.java?view=diff&rev=439936&r1=439935&r2=439936
==============================================================================
---
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/HelloWorldAction.java
(original)
+++
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/HelloWorldAction.java
Sun Sep 3 22:35:34 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package ${groupId};
+package ${package};
import com.opensymphony.xwork2.ActionSupport;
Modified:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/IndexAction.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/IndexAction.java?view=diff&rev=439936&r1=439935&r2=439936
==============================================================================
---
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/IndexAction.java
(original)
+++
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/IndexAction.java
Sun Sep 3 22:35:34 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package ${groupId};
+package ${package};
import com.opensymphony.xwork2.ActionSupport;
Modified:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml?view=diff&rev=439936&r1=439935&r2=439936
==============================================================================
---
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml
(original)
+++
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/resources/struts.xml
Sun Sep 3 22:35:34 2006
@@ -7,7 +7,7 @@
<struts>
<include file="struts-default.xml" />
<package name="myPackage" extends="struts-default">
- <action name="index" class="${groupId}.IndexAction">
+ <action name="index" class="${package}.IndexAction">
<result type="freemarker">/ftl/index.ftl</result>
</action>
<action name="helloWorld" class="helloWorldAction">
Modified:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml?view=diff&rev=439936&r1=439935&r2=439936
==============================================================================
---
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
(original)
+++
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/applicationContext.xml
Sun Sep 3 22:35:34 2006
@@ -5,6 +5,6 @@
<beans>
<!-- Example of SAF2 action instantiated by Spring -->
- <bean id="helloWorldAction" class="${groupId}.HelloWorldAction"
singleton="false" />
+ <bean id="helloWorldAction" class="${package}.HelloWorldAction"
singleton="false" />
</beans>
Modified:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/HelloWorldActionTest.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/HelloWorldActionTest.java?view=diff&rev=439936&r1=439935&r2=439936
==============================================================================
---
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/HelloWorldActionTest.java
(original)
+++
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/HelloWorldActionTest.java
Sun Sep 3 22:35:34 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package ${groupId};
+package ${package};
import junit.framework.TestCase;
Modified:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/IndexActionTest.java
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/IndexActionTest.java?view=diff&rev=439936&r1=439935&r2=439936
==============================================================================
---
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/IndexActionTest.java
(original)
+++
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/IndexActionTest.java
Sun Sep 3 22:35:34 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package ${groupId};
+package ${package};
import junit.framework.TestCase;
Added:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/resources/test.properties
URL:
http://svn.apache.org/viewvc/struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/resources/test.properties?view=auto&rev=439936
==============================================================================
---
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/resources/test.properties
(added)
+++
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/resources/test.properties
Sun Sep 3 22:35:34 2006
@@ -0,0 +1,4 @@
+#
+# Properties for test cases.
+#
+
