Author: tmjee
Date: Sun Sep 3 19:58:55 2006
New Revision: 439910
URL: http://svn.apache.org/viewvc?view=rev&rev=439910
Log:
- fixed situation where -DgroupId=xxx doesn't generate the java files in the
correct package directory
- changed archetype pom.xml <packaging>...</packaging> from "jar" to
"maven-plugin"
- make /META-INF/archetype.xml id same as this archetype artifactId
(struts2-archetype-starter)
- added some missed out resource to archetype.xml
- PROBLEM: the generated resource eg. HelloWorldAction-validation.xml doesn't
honour -DgroupId argument passed in, due to maven archetype doesn't provide a
way for this to happened. I guess one will have to manually rename the package
of those resource if necessary.
Added:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java
- copied, changed from r439906,
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/DateConverter.java
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/HelloWorldAction.java
- copied, changed from r439906,
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/HelloWorldAction.java
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/IndexAction.java
- copied, changed from r439906,
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/IndexAction.java
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/HelloWorldActionTest.java
- copied, changed from r439906,
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/com/myComp/myApp/HelloWorldActionTest.java
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/IndexActionTest.java
- copied, changed from r439906,
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/com/myComp/myApp/IndexActionTest.java
Removed:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/com/
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/com/
Copied:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java
(from r439906,
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/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=439910&p1=struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/DateConverter.java&r1=439906&p2=struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java&r2=439910
==============================================================================
---
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/DateConverter.java
(original)
+++
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/DateConverter.java
Sun Sep 3 19:58:55 2006
@@ -15,6 +15,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+package ${groupId};
+
import org.apache.struts2.util.StrutsTypeConverter;
import java.text.SimpleDateFormat;
Copied:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/HelloWorldAction.java
(from r439906,
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/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=439910&p1=struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/HelloWorldAction.java&r1=439906&p2=struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/HelloWorldAction.java&r2=439910
==============================================================================
---
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/HelloWorldAction.java
(original)
+++
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/HelloWorldAction.java
Sun Sep 3 19:58:55 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.myComp.myApp;
+package ${groupId};
import com.opensymphony.xwork2.ActionSupport;
Copied:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/IndexAction.java
(from r439906,
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/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=439910&p1=struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/IndexAction.java&r1=439906&p2=struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/IndexAction.java&r2=439910
==============================================================================
---
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/com/myComp/myApp/IndexAction.java
(original)
+++
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/main/java/IndexAction.java
Sun Sep 3 19:58:55 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.myComp.myApp;
+package ${groupId};
import com.opensymphony.xwork2.ActionSupport;
Copied:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/HelloWorldActionTest.java
(from r439906,
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/com/myComp/myApp/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=439910&p1=struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/com/myComp/myApp/HelloWorldActionTest.java&r1=439906&p2=struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/HelloWorldActionTest.java&r2=439910
==============================================================================
---
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/com/myComp/myApp/HelloWorldActionTest.java
(original)
+++
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/HelloWorldActionTest.java
Sun Sep 3 19:58:55 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.myComp.myApp;
+package ${groupId};
import junit.framework.TestCase;
Copied:
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/IndexActionTest.java
(from r439906,
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/com/myComp/myApp/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=439910&p1=struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/com/myComp/myApp/IndexActionTest.java&r1=439906&p2=struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/IndexActionTest.java&r2=439910
==============================================================================
---
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/com/myComp/myApp/IndexActionTest.java
(original)
+++
struts/maven/trunk/struts2-archetype-starter/src/main/resources/archetype-resources/src/test/java/IndexActionTest.java
Sun Sep 3 19:58:55 2006
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.myComp.myApp;
+package ${groupId};
import junit.framework.TestCase;
