Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@geronimo.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r933706 - in /geronimo/samples/trunk:
 geronimo-samples-archetype/
 geronimo-samples-archetype/src/main/resources/META-INF/
 geronimo-samples-archetype/src/main/resources/archetype-resources/
 geronimo-samples-archetype/src/main/resources/arche...
Date: Tue, 13 Apr 2010 17:02:42 -0000
To: scm@geronimo.apache.org
From: xiaming@apache.org
Message-Id: <20100413170242.B682B2388905@eris.apache.org>

Author: xiaming
Date: Tue Apr 13 17:02:41 2010
New Revision: 933706

URL: http://svn.apache.org/viewvc?rev=933706&view=rev
Log:
GERONIMO-5252 Update samples archetype for java ee 6

Added:
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/application.xml   (with props)
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/geronimo-application.xml   (with props)
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/ejb-jar.xml   (with props)
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/openejb-jar.xml   (with props)
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/persistence.xml   (with props)
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/WEB-INF/geronimo-web.xml   (with props)
Modified:
    geronimo/samples/trunk/geronimo-samples-archetype/pom.xml
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/META-INF/archetype.xml
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/pom.xml
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/src/main/plan/plan.xml
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/pom.xml
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/src/main/plan/plan.xml
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/WEB-INF/web.xml
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/index.html
    geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/sample-docu.jsp
    geronimo/samples/trunk/samples/javaee6/pom.xml
    geronimo/samples/trunk/samples/pom.xml

Modified: geronimo/samples/trunk/geronimo-samples-archetype/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/pom.xml?rev=933706&r1=933705&r2=933706&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/pom.xml (original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/pom.xml Tue Apr 13 17:02:41 2010
@@ -32,10 +32,10 @@
     </parent>
 
     <artifactId>geronimo-samples-archetype</artifactId>
-    <name>Geronimo Samples  ::  Archetype</name>
+    <name>Geronimo Samples :: Archetype</name>
     <packaging>jar</packaging>
     
-    <description> Plugin to help create a samples project</description>
+    <description>Plugin to help create a samples project</description>
 
 </project>
 

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/META-INF/archetype.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/META-INF/archetype.xml?rev=933706&r1=933705&r2=933706&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/META-INF/archetype.xml (original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/META-INF/archetype.xml Tue Apr 13 17:02:41 2010
@@ -26,7 +26,12 @@
     <resources>
         <resource>pom.xml</resource>
         <resource>sample-ear/pom.xml</resource>
+        <resource>sample-ear/src/main/resources/META-INF/geronimo-application.xml</resource>
+        <resource>sample-ear/src/main/resources/META-INF/application.xml</resource>
         <resource>sample-ejb/pom.xml</resource>
+        <resource>sample-ejb/src/main/resources/META-INF/ejb-jar.xml</resource>
+        <resource>sample-ejb/src/main/resources/META-INF/openejb-jar.xml</resource>
+        <resource>sample-ejb/src/main/resources/META-INF/persistence.xml</resource>
         <resource>sample-ejb/src/main/java/org/apache/geronimo/samples/ejb/SampleBean.java</resource>
         <resource>sample-ejb/src/main/java/org/apache/geronimo/samples/ejb/SampleBeanLocal.java</resource>
         <resource>sample-ejb/src/main/java/org/apache/geronimo/samples/ejb/SampleBeanRemote.java</resource>
@@ -36,6 +41,7 @@
         <resource>sample-war/src/main/webapp/index.html</resource>
         <resource>sample-war/src/main/webapp/sample-docu.jsp</resource>
         <resource>sample-war/src/main/webapp/WEB-INF/web.xml</resource>
+        <resource>sample-war/src/main/webapp/WEB-INF/geronimo-web.xml</resource>
         <resource>sample-jetty/pom.xml</resource>
         <resource>sample-jetty/src/main/plan/plan.xml</resource>
         <resource>sample-tomcat/pom.xml</resource>

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml?rev=933706&r1=933705&r2=933706&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/pom.xml Tue Apr 13 17:02:41 2010
@@ -26,7 +26,7 @@
     
     <parent>
         <groupId>org.apache.geronimo.samples</groupId>
-        <artifactId>samples</artifactId>
+        <artifactId>javaee6</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
     

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml?rev=933706&r1=933705&r2=933706&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml (original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/pom.xml Tue Apr 13 17:02:41 2010
@@ -59,7 +59,7 @@
                 <configuration>
                     <displayName>Geronimo Sample EAR for ${artifactId}</displayName>
                     <description>Geronimo Sample EAR for ${artifactId}</description>
-                    <version>5</version>
+                    <version>6</version>
                     <modules>
                       <ejbModule>
                             <groupId>${groupId}</groupId>

Added: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/application.xml?rev=933706&view=auto
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/application.xml (added)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/application.xml Tue Apr 13 17:02:41 2010
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<application xmlns="http://java.sun.com/xml/ns/javaee"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+      	http://java.sun.com/xml/ns/javaee/application_6.xsd"
+      version="6" id="${pom.artifactId}">
+
+  <display-name>${pom.name}</display-name>
+  <module>
+    <web>
+      <web-uri>${artifactId}-war-${version}.war</web-uri>
+      <context-root>${artifactId}</context-root>
+    </web>
+  </module>
+  <module>
+    <ejb>${artifactId}-ejb-${version}.jar</ejb>
+  </module>
+</application>

Propchange: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/application.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/application.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/application.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/geronimo-application.xml?rev=933706&view=auto
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/geronimo-application.xml (added)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/geronimo-application.xml Tue Apr 13 17:02:41 2010
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<application application-name="${artifactId}"
+	xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
+	<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+		<moduleId>
+			<groupId>org.apache.geronimo.samples</groupId>
+			<artifactId>${artifactId}</artifactId>
+			<version>${version}</version>
+			<type>car</type>
+		</moduleId>
+		<dependencies>
+			<!--<dependency>
+				<groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>system-database</artifactId>
+                <type>car</type>
+			</dependency>-->
+		</dependencies>
+	</environment>
+
+	<module>
+		<ejb>${artifactId}-ejb-${version}.jar</ejb>
+		<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
+			<!--<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+				version="1.0">
+				<persistence-unit name="UnitName">
+					<properties>
+						<property name="openjpa.jdbc.DBDictionary" value="derby" />
+					</properties>
+				</persistence-unit>
+			</persistence>-->
+		</openejb-jar>
+	</module>
+
+    <module>
+        <web>${artifactId}-war-${version}.war</web>
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
+            <!--<service-ref>
+                <service-ref-name>service/YourSample</service-ref-name>
+                <port>
+                    <port-name>YourSampleWSServices</port-name>
+                    <protocol>http</protocol>
+                    <host>localhost</host>
+                    <port>8080</port>
+                    <uri>/YourSample/services/YourSampleWSServices</uri>
+                </port>
+            </service-ref>-->
+        </web-app>
+    </module>
+
+	<!--<ext-module>
+		<connector>ConnectorName</connector>
+		<external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+			<dep:groupId>org.tranql</dep:groupId>
+			<dep:artifactId>tranql-connector-derby-embed-xa</dep:artifactId>
+			<dep:type>rar</dep:type>
+		</external-path>
+		<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+			<resourceadapter>
+				<outbound-resourceadapter>
+					<connection-definition>
+						<connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+						<connectiondefinition-instance>
+							<name>jdbc/YourSampleDS</name>
+							<config-property-setting name="UserName"></config-property-setting>
+                            <config-property-setting name="Password"></config-property-setting>
+                            <config-property-setting name="DatabaseName">derbydb</config-property-setting>
+                            <config-property-setting name="CreateDatabase">true</config-property-setting>
+							<connectionmanager>
+								<xa-transaction>
+									<transaction-caching />
+								</xa-transaction>
+								<single-pool>
+									<max-size>100</max-size>
+									<min-size>0</min-size>
+									<blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+									<idle-timeout-minutes>30</idle-timeout-minutes>
+									<match-one />
+								</single-pool>
+							</connectionmanager>
+						</connectiondefinition-instance>						
+						<connectiondefinition-instance>
+                            <name>jdbc/NoTxYourSampleDS</name>
+                            <config-property-setting name="UserName"></config-property-setting>
+                            <config-property-setting name="Password"></config-property-setting>
+                            <config-property-setting name="DatabaseName">derbydb</config-property-setting>
+                            <config-property-setting name="CreateDatabase">true</config-property-setting>
+                            <connectionmanager>
+                                <no-transaction/>
+                                <single-pool>
+                                    <max-size>10</max-size>
+                                    <min-size>0</min-size>
+                                    <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                    <idle-timeout-minutes>30</idle-timeout-minutes>
+                                    <match-one/>
+                                </single-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>
+					</connection-definition>
+				</outbound-resourceadapter>
+			</resourceadapter>
+		</connector>
+	</ext-module>-->
+	
+	
+
+  <!--<security xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0">
+    <sec:default-principal>
+      <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="anonymous"/>
+    </sec:default-principal>
+    <sec:role-mappings>
+      <sec:role role-name="admin">
+        <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin"/>
+        <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="system"/>        
+      </sec:role>
+      <sec:role role-name="superadmin">
+        <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="superadmin"/>
+        <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="superman"/>        
+      </sec:role>
+    </sec:role-mappings>
+  </security>-->
+	
+	<!--<gbean name="DBInitialization" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
+        <attribute name="path">sample.sql</attribute>
+        <reference name="DataSource">
+            <name>jdbc/NoTxYourSampleDS</name>
+        </reference>
+    </gbean>-->
+</application>

Propchange: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/geronimo-application.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/geronimo-application.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/ejb-jar.xml?rev=933706&view=auto
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/ejb-jar.xml (added)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/ejb-jar.xml Tue Apr 13 17:02:41 2010
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+      	  http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
+      version="3.1">
+
+    <display-name>${artifactId} Bean Definitions</display-name>
+    
+    <enterprise-beans>
+		<!--<session>
+			<ejb-name>ejb/YourBeanName</ejb-name>
+			<business-local>org.apache.geronimo.samples.${artifactId}.YourBeanLocal</business-local>
+			<business-remote>org.apache.geronimo.samples.${artifactId}.YourBeanRemote</business-remote>
+			<ejb-class>org.apache.geronimo.samples.${artifactId}.YourBeanImpl</ejb-class>
+			<session-type>Stateless</session-type>
+			<transaction-type>Container</transaction-type>
+		</session>	-->
+	</enterprise-beans>
+	
+	<!--<assembly-descriptor>
+			<method-permission>
+				<role-name>superadmin</role-name>
+				<method>
+					<ejb-name>ejb/YourBeanName</ejb-name>
+					<method-name>*</method-name>
+				</method>
+			</method-permission>			
+			<method-permission>
+				<role-name>admin</role-name>
+				<method>
+					<ejb-name>ejb/YourBeanName</ejb-name>
+					<method-name>YourBeanMethodName</method-name>					
+				</method>
+			</method-permission>
+	</assembly-descriptor>  -->   
+</ejb-jar>
+

Propchange: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/ejb-jar.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/ejb-jar.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/ejb-jar.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=933706&view=auto
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/openejb-jar.xml (added)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/openejb-jar.xml Tue Apr 13 17:02:41 2010
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<openejb-jar xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
+	xmlns:client="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0"
+	xmlns:conn="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2"
+	xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
+	xmlns:name="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:pers="http://java.sun.com/xml/ns/persistence"
+	xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1" xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
+	xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
+	<dep:environment>
+		<dep:moduleId>
+			<dep:groupId>org.apache.geronimo.samples</dep:groupId>
+			<dep:artifactId>${artifactId}-ejb</dep:artifactId>
+			<dep:version>${version}</dep:version>
+			<dep:type>car</dep:type>
+		</dep:moduleId>
+	</dep:environment>
+</openejb-jar>

Propchange: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/openejb-jar.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/openejb-jar.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/openejb-jar.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/persistence.xml?rev=933706&view=auto
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/persistence.xml (added)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/persistence.xml Tue Apr 13 17:02:41 2010
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
+          http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
+        version="2.0">
+
+  <persistence-unit name="UnitName" transaction-type="JTA">
+    <description>${artifactId} Unit Definition</description>
+    <!--<jta-data-source>jdbc/YourSampleDS</jta-data-source>
+    <non-jta-data-source>jdbc/NoTxYourSampleDS</non-jta-data-source>	
+    <class>org.apache.geronimo.samples.${artifactId}.beans.YourJPABean</class>    
+    <exclude-unlisted-classes>true</exclude-unlisted-classes>
+    <properties>      
+        <property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=1)"/>       
+        <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
+        <property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO, Runtime=TRACE, SQL=TRACE"/>
+    </properties>-->
+  </persistence-unit>
+</persistence>
+

Propchange: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/persistence.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/persistence.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/resources/META-INF/persistence.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/pom.xml?rev=933706&r1=933705&r2=933706&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/pom.xml (original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/pom.xml Tue Apr 13 17:02:41 2010
@@ -30,7 +30,6 @@
         <version>${version}</version>
     </parent>
 
-    <groupId>org.apache.geronimo.samples</groupId>
     <artifactId>${artifactId}-jetty</artifactId>
     <name>Geronimo Samples :: ${artifactId} Plugin for Jetty</name>
     <packaging>car</packaging>
@@ -79,7 +78,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>persistence-jpa10-deployer</artifactId>
+            <artifactId>persistence-jpa20-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/src/main/plan/plan.xml?rev=933706&r1=933705&r2=933706&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-jetty/src/main/plan/plan.xml Tue Apr 13 17:02:41 2010
@@ -19,9 +19,9 @@
 -->
 
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
 
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
       <dep:moduleId>
          <dep:groupId>${pom.groupId}</dep:groupId>
          <dep:artifactId>${pom.artifactId}</dep:artifactId>

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/pom.xml?rev=933706&r1=933705&r2=933706&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/pom.xml Tue Apr 13 17:02:41 2010
@@ -30,7 +30,6 @@
         <version>${version}</version>
     </parent>
 
-    <groupId>org.apache.geronimo.samples</groupId>
     <artifactId>${artifactId}-tomcat</artifactId>
     <name>Geronimo Samples :: ${artifactId} Plugin for Tomcat</name>
     <packaging>car</packaging>
@@ -47,7 +46,7 @@
         
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-deployer</artifactId>
+            <artifactId>${tomcat}-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>
@@ -79,7 +78,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>persistence-jpa10-deployer</artifactId>
+            <artifactId>persistence-jpa20-deployer</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
             <scope>provided</scope>

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/src/main/plan/plan.xml?rev=933706&r1=933705&r2=933706&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-tomcat/src/main/plan/plan.xml Tue Apr 13 17:02:41 2010
@@ -19,9 +19,9 @@
 -->
 
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
 
-   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+   <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
       <dep:moduleId>
          <dep:groupId>${pom.groupId}</dep:groupId>
          <dep:artifactId>${pom.artifactId}</dep:artifactId>

Added: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=933706&view=auto
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/WEB-INF/geronimo-web.xml (added)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/WEB-INF/geronimo-web.xml Tue Apr 13 17:02:41 2010
@@ -0,0 +1,20 @@
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1" 
+         xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" 
+         xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" 
+         xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
+  <sys:environment>
+    <sys:moduleId>
+      <sys:groupId>org.apache.geronimo.samples</sys:groupId>
+      <sys:artifactId>${artifactId}</sys:artifactId>
+      <sys:version>${version}</sys:version>
+      <sys:type>car</sys:type>
+    </sys:moduleId>
+    <sys:dependencies/>
+    <sys:hidden-classes/>
+    <sys:non-overridable-classes/>
+  </sys:environment>
+
+  <context-root>/${artifactId}</context-root>
+
+</web-app>

Propchange: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/WEB-INF/web.xml?rev=933706&r1=933705&r2=933706&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/WEB-INF/web.xml Tue Apr 13 17:02:41 2010
@@ -20,7 +20,7 @@
 
 <!-- $Rev$ $Date$ -->
 
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="${artifactId}">
 
     <description>${artifactId} Servlet Sample</description>
     <servlet>

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/index.html?rev=933706&r1=933705&r2=933706&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/index.html (original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/index.html Tue Apr 13 17:02:41 2010
@@ -18,7 +18,7 @@
 <html>
 <head>
   <title>Apache Geronimo Sample Application</title>
-  <meta content="text/html; CHARSET=iso-8859-1" http-equiv="Content-Type">
+  <meta content="text/html; CHARSET=UTF-8" http-equiv="Content-Type">
 </head>
 
 <FRAMESET rows="86px,*" frameborder="0">

Modified: geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/sample-docu.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/sample-docu.jsp?rev=933706&r1=933705&r2=933706&view=diff
==============================================================================
--- geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/sample-docu.jsp (original)
+++ geronimo/samples/trunk/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-war/src/main/webapp/sample-docu.jsp Tue Apr 13 17:02:41 2010
@@ -15,11 +15,11 @@
    limitations under the License.
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd class="cell"">
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <html>
 <head>
   <title>Sample for ${artifactId}</title>
-  <meta content="text/html; CHARSET=iso-8859-1" http-equiv="Content-Type">
+  <meta content="text/html; CHARSET=UTF-8" http-equiv="Content-Type">
 </head>
 
 <BODY>

Modified: geronimo/samples/trunk/samples/javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/pom.xml?rev=933706&r1=933705&r2=933706&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/pom.xml Tue Apr 13 17:02:41 2010
@@ -16,10 +16,7 @@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
--->
-<!-- $Rev$ $Date$ -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+--><!-- $Rev$ $Date$ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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.geronimo.samples</groupId>
@@ -105,6 +102,54 @@
     </build>
 
     <profiles>
+        <!-- This profile creates a sample template.
+              Use -DsampleName to specify the name of your sample.
+              Use -DsampleVersion to specify the version for your sample
+        -->
+        <profile>
+            <id>create</id>            
+            <build>
+                <defaultGoal>validate</defaultGoal>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <version>1.3</version>                        
+                        <inherited>false</inherited>
+                        <executions>
+                            <execution>
+                                <phase>validate</phase>
+                                <configuration>
+                                    <tasks>
+                                        <condition property="mvn.exe" value="mvn.bat" else="mvn">
+                                            <os family="windows"/>
+                                        </condition>
+                                        <exec executable="${mvn.exe}">
+                                            <arg value="archetype:create"/>
+                                            <arg value="-DarchetypeGroupId=org.apache.geronimo.samples"/>
+                                            <arg value="-DarchetypeArtifactId=geronimo-samples-archetype"/>
+                                            <arg value="-DarchetypeVersion=${version}"/>
+                                            <arg value="-DartifactId=${sampleName}"/>
+                                            <arg value="-Dversion=${sampleVersion}"/>
+                                            <arg value="-o"/>
+                                            <arg value="-Pno-plugin"/>
+                                        </exec>
+                                        <move file="${sampleName}/sample-ear" tofile="${sampleName}/${sampleName}-ear"/>
+                                        <move file="${sampleName}/sample-ejb" tofile="${sampleName}/${sampleName}-ejb"/>
+                                        <move file="${sampleName}/sample-war" tofile="${sampleName}/${sampleName}-war"/>
+                                        <move file="${sampleName}/sample-jetty" tofile="${sampleName}/${sampleName}-jetty"/>
+                                        <move file="${sampleName}/sample-tomcat" tofile="${sampleName}/${sampleName}-tomcat"/>
+                                    </tasks>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>default</id>
             <activation>
@@ -127,5 +172,5 @@
                 <module>cviewer-javaee6</module>
             </modules>
         </profile>
-    </profiles>   
+    </profiles>
 </project>

Modified: geronimo/samples/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/pom.xml?rev=933706&r1=933705&r2=933706&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/pom.xml (original)
+++ geronimo/samples/trunk/samples/pom.xml Tue Apr 13 17:02:41 2010
@@ -136,70 +136,7 @@
         </pluginManagement>        
     </build>
 
-    <profiles>
-        <!-- This profile creates a sample template.
-              Use -DsampleName to specify the name of your sample.
-              Use -DsampleVersion to specify the version for your sample
-        -->
-        <profile>
-            <id>create</id>
-            <build>
-                <defaultGoal>validate</defaultGoal>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <version>1.1</version>
-                        <dependencies>
-                            <dependency>
-                                <groupId>oro</groupId>
-                                <artifactId>oro</artifactId>
-                                <version>2.0.8</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>ant</groupId>
-                                <artifactId>ant-apache-oro</artifactId>
-                                <version>1.6.4</version>
-                            </dependency>
-                            <dependency>
-                                <groupId>ant</groupId>
-                                <artifactId>ant-optional</artifactId>
-                                <version>1.5.3-1</version>
-                            </dependency>
-                        </dependencies>
-                        <inherited>false</inherited>
-                        <executions>
-                            <execution>
-                                <phase>validate</phase>
-                                <configuration>
-                                    <tasks>
-                                        <condition property="mvn.exe" value="mvn.bat" else="mvn">
-                                            <os family="windows"/>
-                                        </condition>
-                                        <exec executable="${mvn.exe}">
-                                            <arg value="archetype:create"/>
-                                            <arg value="-DarchetypeGroupId=org.apache.geronimo.samples"/>
-                                            <arg value="-DarchetypeArtifactId=geronimo-samples-archetype"/>
-                                            <arg value="-DarchetypeVersion=${version}"/>
-                                            <arg value="-DartifactId=${sampleName}"/>
-                                            <arg value="-Dversion=${sampleVersion}"/>
-                                        </exec>
-                                        <move file="${sampleName}/sample-ear" tofile="${sampleName}/${sampleName}-ear"/>
-                                        <move file="${sampleName}/sample-ejb" tofile="${sampleName}/${sampleName}-ejb"/>
-                                        <move file="${sampleName}/sample-war" tofile="${sampleName}/${sampleName}-war"/>
-                                        <move file="${sampleName}/sample-jetty" tofile="${sampleName}/${sampleName}-jetty"/>
-                                        <move file="${sampleName}/sample-tomcat" tofile="${sampleName}/${sampleName}-tomcat"/>
-                                    </tasks>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
+    <profiles>        
         <profile>
             <id>default</id>
             <activation>