geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r937938 [2/2] - in /geronimo/samples/trunk/samples/javaee6: ./ jpa20demo-javaee6/ jpa20demo-javaee6/jpa20demo-javaee6-jetty/ jpa20demo-javaee6/jpa20demo-javaee6-jetty/src/ jpa20demo-javaee6/jpa20demo-javaee6-jetty/src/main/ jpa20demo-javaee...
Date Mon, 26 Apr 2010 06:48:24 GMT
Added: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/pom.xml?rev=937938&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/pom.xml (added)
+++ geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/pom.xml Mon Apr 26 06:48:22 2010
@@ -0,0 +1,83 @@
+<?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.
+-->
+
+<!-- $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>
+        <artifactId>javaee6</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+    
+    <artifactId>jpa20demo-javaee6</artifactId>
+    <name>Geronimo Samples :: jpa20demo-javaee6</name>
+    <packaging>pom</packaging>
+    
+    <description>
+        Geronimo jpa20demo-javaee6 sample used techniques including JSF and JPA
+    </description>
+    
+   <modules>
+        
+    </modules>
+
+   <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-site-plugin</artifactId>
+                <inherited>false</inherited>
+                <configuration>
+                  <outputDirectory>${project.basedir}/docs</outputDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <modules>
+                <module>jpa20demo-javaee6-war</module>
+                <module>jpa20demo-javaee6-jetty</module>
+                <module>jpa20demo-javaee6-tomcat</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>no-plugin</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>        
+                <property>
+                    <name>buildPlugin</name>
+                    <value>false</value>
+                </property>        
+            </activation>
+            <modules>
+                <module>jpa20demo-javaee6-war</module>
+            </modules>
+        </profile>
+    </profiles>   
+</project>

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/samples/trunk/samples/javaee6/jpa20demo-javaee6/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/samples/trunk/samples/javaee6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/pom.xml?rev=937938&r1=937937&r2=937938&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee6/pom.xml Mon Apr 26 06:48:22 2010
@@ -41,10 +41,10 @@
         <axisDeployer>org.apache.geronimo.configs/axis-deployer/${geronimoVersion}/car</axisDeployer>
         <cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${geronimoVersion}/car</cxfDeployer>
         <axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${geronimoVersion}/car</axis2Deployer>
-        <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
+        <tomcatDeployer>org.apache.geronimo.configs/tomcat7-deployer/${geronimoVersion}/car</tomcatDeployer>
         <jettyDeployer>org.apache.geronimo.configs/${jetty}-deployer/${geronimoVersion}/car</jettyDeployer>
         <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
-        <jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car</jpaDeployer>
+        <jpaDeployer>org.apache.geronimo.configs/persistence-jpa20-deployer/${geronimoVersion}/car</jpaDeployer>
     </properties>
 
     
@@ -131,7 +131,6 @@
                                             <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"/>
@@ -157,6 +156,7 @@
             </activation>
             <modules>
                 <module>cviewer-javaee6</module>
+                <module>jpa20demo-javaee6</module>
             </modules>
         </profile>
         <profile>
@@ -170,7 +170,8 @@
             </activation>
             <modules>
                 <module>cviewer-javaee6</module>
+                <module>jpa20demo-javaee6</module>
             </modules>
         </profile>
-    </profiles>
+    </profiles>  
 </project>



Mime
View raw message