Author: antelder
Date: Sat Feb 28 08:35:51 2009
New Revision: 748791
URL: http://svn.apache.org/viewvc?rev=748791&view=rev
Log:
Clean up the quickstart archetype and update to use the latest maven archetype
plugin and get console prompting style work so 'mvn archetype:generate' works
now
Added:
tuscany/java/sca/archetypes/quickstart/src/main/resources/META-INF/maven/
tuscany/java/sca/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
tuscany/java/sca/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml
Removed:
tuscany/java/sca/archetypes/quickstart/src/main/resources/META-INF/archetype.xml
Modified:
tuscany/java/sca/archetypes/quickstart/pom.xml
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
Modified: tuscany/java/sca/archetypes/quickstart/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/archetypes/quickstart/pom.xml?rev=748791&r1=748790&r2=748791&view=diff
==============================================================================
--- tuscany/java/sca/archetypes/quickstart/pom.xml (original)
+++ tuscany/java/sca/archetypes/quickstart/pom.xml Sat Feb 28 08:35:51 2009
@@ -26,20 +26,25 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>tuscany-archetype-quickstart</artifactId>
- <packaging>maven-plugin</packaging>
- <name>Apache Tuscany Quickstart Archetype</name>
+ <artifactId>tuscany-quickstart</artifactId>
+ <packaging>maven-archetype</packaging>
+ <name>Create a simple Apache Tuscany SCA webapp project</name>
<build>
- <resources>
- <resource>
- <filtering>false</filtering>
- <directory>${basedir}/src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
- </build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-packaging</artifactId>
+ <version>2.0-alpha-3</version>
+ </extension>
+ </extensions>
+ <plugins>
+ <plugin>
+ <artifactId>maven-archetype-plugin</artifactId>
+ <version>2.0-alpha-3</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Added:
tuscany/java/sca/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=748791&view=auto
==============================================================================
---
tuscany/java/sca/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
(added)
+++
tuscany/java/sca/archetypes/quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
Sat Feb 28 08:35:51 2009
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?><archetype-descriptor name="myproject">
+ <fileSets>
+ <fileSet filtered="true" packaged="true" encoding="UTF-8">
+ <directory>src/main/java</directory>
+ <includes>
+ <include>**/*.java</include>
+ </includes>
+ </fileSet>
+ <fileSet filtered="true" encoding="UTF-8">
+ <directory>src/main/webapp</directory>
+ <includes>
+ <include>**/*.jsp</include>
+ <include>**/*.xml</include>
+ <include>**/*.composite</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</archetype-descriptor>
\ No newline at end of file
Added:
tuscany/java/sca/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml?rev=748791&view=auto
==============================================================================
---
tuscany/java/sca/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml
(added)
+++
tuscany/java/sca/archetypes/quickstart/src/main/resources/META-INF/maven/archetype.xml
Sat Feb 28 08:35:51 2009
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?><archetype>
+ <id>tuscany-quickstart</id>
+ <sources>
+ <source>src\main\java\HelloworldImpl.java</source>
+ <source>src\main\java\HelloworldService.java</source>
+ </sources>
+ <resources>
+ <resource>src\main\webapp\hello.jsp</resource>
+ <resource>src\main\webapp\WEB-INF\web.composite</resource>
+ <resource>src\main\webapp\WEB-INF\web.xml</resource>
+ </resources>
+</archetype>
\ No newline at end of file
Modified:
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml?rev=748791&r1=748790&r2=748791&view=diff
==============================================================================
---
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
(original)
+++
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
Sat Feb 28 08:35:51 2009
@@ -54,6 +54,8 @@
</dependency>
</dependencies>
<build>
+ <defaultGoal>install</defaultGoal>
+ <finalName>${artifactId}</finalName>
<resources>
<resource>
<filtering>false</filtering>
Modified:
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java?rev=748791&r1=748790&r2=748791&view=diff
==============================================================================
---
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
(original)
+++
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldImpl.java
Sat Feb 28 08:35:51 2009
@@ -1,4 +1,4 @@
-package ${packageName};
+package ${package};
public class HelloworldImpl implements HelloworldService {
Modified:
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java?rev=748791&r1=748790&r2=748791&view=diff
==============================================================================
---
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
(original)
+++
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/java/HelloworldService.java
Sat Feb 28 08:35:51 2009
@@ -1,4 +1,4 @@
-package ${packageName};
+package ${package};
public interface HelloworldService {
Modified:
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite?rev=748791&r1=748790&r2=748791&view=diff
==============================================================================
---
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
(original)
+++
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.composite
Sat Feb 28 08:35:51 2009
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0";
- targetNamespace="http://${packageName}";
+ targetNamespace="http://${package}";
name=">${artifactId}">
- <component name="=">${artifactId}.web">
+ <component name="${artifactId}WebComponent">
<implementation.web web-uri=""/>
<reference name="service" target="HelloworldComponent"/>
</component>
<component name="HelloworldComponent">
- <implementation.java class="${packageName}.HelloworldImpl"/>
+ <implementation.java class="${package}.HelloworldImpl"/>
</component>
</composite>
Modified:
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/hello.jsp?rev=748791&r1=748790&r2=748791&view=diff
==============================================================================
---
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
(original)
+++
tuscany/java/sca/archetypes/quickstart/src/main/resources/archetype-resources/src/main/webapp/hello.jsp
Sat Feb 28 08:35:51 2009
@@ -1,7 +1,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ taglib uri="http://www.osoa.org/sca/sca_jsp.tld"; prefix="sca" %>
-<sca:reference name="service" type="${packageName}.HelloworldService" />
+<sca:reference name="service" type="${package}.HelloworldService" />
<html>
<body >
