geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r630411 - in /geronimo/server/trunk/buildsupport: ./ geronimo-assembly-archetype/ geronimo-assembly-archetype/src/main/resources/META-INF/maven/ geronimo-assembly-archetype/src/main/resources/archetype-resources/ geronimo-assembly-archetype...
Date Sat, 23 Feb 2008 08:08:16 GMT
Author: djencks
Date: Sat Feb 23 00:08:15 2008
New Revision: 630411

URL: http://svn.apache.org/viewvc?rev=630411&view=rev
Log:
GERONIMO-3871 first draft of assembly archetype

Added:
    geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/
      - copied from r630365, geronimo/server/trunk/buildsupport/geronimo-module-archetype/
Removed:
    geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/src/
Modified:
    geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/pom.xml
    geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/META-INF/maven/archetype.xml
    geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml
    geronimo/server/trunk/buildsupport/pom.xml

Modified: geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/pom.xml?rev=630411&r1=630365&r2=630411&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/pom.xml Sat Feb 23 00:08:15
2008
@@ -5,7 +5,7 @@
     <version>2.2-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>geronimo-module-archetype</artifactId>
-  <name>Archetype - geronimo-module-archetype</name>
+  <artifactId>geronimo-assembly-archetype</artifactId>
+  <name>Archetype - geronimo-assembly-archetype</name>
   <url>http://geronimo.apache.org</url>
 </project>

Modified: geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/META-INF/maven/archetype.xml?rev=630411&r1=630365&r2=630411&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/META-INF/maven/archetype.xml
(original)
+++ geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/META-INF/maven/archetype.xml
Sat Feb 23 00:08:15 2008
@@ -1,6 +1,3 @@
 <archetype>
   <id>geronimo-module-archetype</id>
-  <resources>
-    <resource>src/main/plan/plan.xml</resource>
-  </resources>
 </archetype>

Modified: geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml?rev=630411&r1=630365&r2=630411&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml
(original)
+++ geronimo/server/trunk/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.xml
Sat Feb 23 00:08:15 2008
@@ -4,33 +4,26 @@
     <groupId>${groupId}</groupId>
     <artifactId>${artifactId}</artifactId>
     <version>${version}</version>
-    <packaging>car</packaging>
+    <packaging>application-assembly</packaging>
 
     <properties>
         <!-- This property is required by the car:package mojo -->
-        <geronimoVersion>2.1</geronimoVersion>
+        <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
 
-        <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car</gbeanDeployerBootstrap>
-        <gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
-        <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
-        <clientDeployer>org.apache.geronimo.configs/client-deployer/${geronimoVersion}/car</clientDeployer>
-        <connectorDeployer>org.apache.geronimo.configs/connector-deployer/${geronimoVersion}/car</connectorDeployer>
-        <openejbDeployer>org.apache.geronimo.configs/openejb-deployer/${geronimoVersion}/car</openejbDeployer>
-        <openejbcorbaDeployer>org.apache.geronimo.configs/openejb-corba-deployer/${geronimoVersion}/car</openejbcorbaDeployer>
-        <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>
-        <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jetty6Deployer>
-        <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
-        <jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car</jpaDeployer>
     </properties>
 
 
     <dependencies>
-        <!-- if you are deploying a jee application, use scope provided -->
-        <!-- other dependencies will normally end up as dependencies in the plan and geronimo-plugin.xml
-->
-        <!-- include dependencies on all deployer modules needed, with scope provided
-->
+        <!-- You will need the boilerplate to get a runnable server -->
+        <dependency>
+            <groupId>org.apache.geronimo.assemblies</groupId>
+            <artifactId>geronimo-boilerplate-minimal</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>jar</type>
+        </dependency>
+
+
+        <!-- List the plugins you want in your server -->
 
     </dependencies>
 
@@ -43,85 +36,114 @@
                     <artifactId>car-maven-plugin</artifactId>
                     <version>${geronimoVersion}</version>
                     <extensions>true</extensions>
-                    <configuration>
-                        <!-- where in plugin catalog this should go -->
-                        <category>MyCategory</category>
-                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                    <artifactId>tools-maven-plugin</artifactId>
+                    <version>1.3</version>
+                    <extensions>true</extensions>
                 </plugin>
 
             </plugins>
         </pluginManagement>
-
+        <!-- uncomment if you have more content to stuff in here (not recommended - use
a plugin with copy-files) -->
+<!--
         <resources>
             <resource>
                 <directory>${pom.basedir}/src/main/resources</directory>
                 <filtering>true</filtering>
             </resource>
         </resources>
+-->
 
         <plugins>
             <plugin>
+                <groupId>org.apache.geronimo.genesis.plugins</groupId>
+                <artifactId>tools-maven-plugin</artifactId>
+
+                <!-- Tools includes custom packagings, install as extension to pick them
up -->
+                <extensions>true</extensions>
+
+<!--
+                <executions>
+                    <execution>
+                        <id>install-legal-files</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-legal-files</goal>
+                        </goals>
+                        <configuration>
+                            -->
+<!-- Fail the build if no legal files were copied -->
+<!--
+                            <strict>true</strict>
+                        </configuration>
+                    </execution>
+
+                    <execution>
+                        <id>verify-legal-files</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>verify-legal-files</goal>
+                        </goals>
+                        <configuration>
+                            -->
+<!-- Fail the build if no legal files were found -->
+<!--
+                            <strict>true</strict>
+                        </configuration>
+                    </execution>
+                </executions>
+-->
+            </plugin>
+            <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>install</id>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>install-modules</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>archive</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>archive</goal>
+                        </goals>
+                    </execution>
+                </executions>
                 <configuration>
-                    <deploymentConfigs>
-                        <!-- gbean deployer is default.  For jee apps include all deployers
your app needs, see properties -->
-                        <!--<deploymentConfig>${gbeanDeployer}</deploymentConfig>-->
-                        <!--<deploymentConfig>${j2eeDeployer}</deploymentConfig>-->
-                        <!--<deploymentConfig>${jetty6Deployer}</deploymentConfig>-->
-                        <!--<deploymentConfig>${jasperDeployer}</deploymentConfig>-->
-                        <!--<deploymentConfig>${jpaDeployer}</deploymentConfig>-->
-                    </deploymentConfigs>
-                    <!-- if you are deploying a jee app specify it here -->
-                    <!--
-                                        <module>
-                                            <groupId>org.apache.roller</groupId>
-                                            <artifactId>roller-weblogger-geronimo</artifactId>
-                                            <type>war</type>
-                                        </module>
-                    -->
-                    <!-- Normally you can use the maven dependencies unaltered.  If you
need to specify import scope
-                     you can list the dependencies here as you want them in the plan.xml
-->
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
-                    <!-- the instance sets up most of the optional geronimo-plugin.xml
content -->
-                    <instance>
-                        <plugin-artifact>
-                            <!-- prerequisites prevent your module from being installed
unless already present -->
-                            <!--
-                                                        <prerequisite>
-                                                            <id>
-                                                                <groupId>mysql</groupId>
-                                                                <artifactId>mysql-connector-java</artifactId>
-                                                                <version>3.1.12</version>
-                                                                <type>jar</type>
-                                                            </id>
-                                                            <resource-type>Database
Connector</resource-type>
-                                                            <description>
-                                                                (why this can't be installed
as a dependency)
-                                                            </description>
-                                                        </prerequisite>
-                            -->
-                            <!-- extract stuff from the car to the specified location
(good for config info -->
-                            <!--<copy-file relative-to="server" dest-dir="var/roller-data">themes</copy-file>-->
-                            <!-- content that should go into var/config/config.xml for
module customization -->
-                            <!-- note the variable ${RollerContextPath} which is further
specified in var/config/config-substitutions.properties -->
-                            <!--
-                                                        <config-xml-content server="default">
-                                                            <gbean name="org.apache.geronimo.plugins/roller-jetty/1.0-SNAPSHOT/car">
-                                                                <attribute name="contextPath">${RollerContextPath}</attribute>
-                                                            </gbean>
-                                                        </config-xml-content>
-                            -->
-                            <!-- a user-tweakable variable to go into var/config/config-substitutions.properties
-->
-                            <!--<config-substitution key="RollerContextPath">/roller</config-substitution>-->
-                            <!-- artifact aliases let your module substitute for another
one, e.g one db for another -->
-                            <!--<artifact-alias key="org.apache.geronimo.plugins/roller-derby-database/${version}/car">org.apache.geronimo.plugins/roller-mysql-database/${version}/car</artifact-alias>-->
-
-                        </plugin-artifact>
-                    </instance>
+                    <servers>
+                        <serverInstance>
+                            <name>default</name>
+                            <configFile>var/config/config.xml</configFile>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                        <serverInstance>
+                            <name>client</name>
+                            <attributeManagerFrom>default</attributeManagerFrom>
+                            <artifactAliasesFile>var/config/client_artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                        <serverInstance>
+                            <name>offline</name>
+                            <configFile>var/config/offline-deployer-config.xml</configFile>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                        <serverInstance>
+                            <name>jsr88</name>
+                            <configFile>var/config/jsr88-configurer-config.xml</configFile>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                    </servers>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/buildsupport/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/buildsupport/pom.xml?rev=630411&r1=630410&r2=630411&view=diff
==============================================================================
--- geronimo/server/trunk/buildsupport/pom.xml (original)
+++ geronimo/server/trunk/buildsupport/pom.xml Sat Feb 23 00:08:15 2008
@@ -69,6 +69,7 @@
         <module>testsuite-maven-plugin</module>
         <module>testsuite-archetype-plugin</module>
         <module>geronimo-module-archetype</module>
+        <module>geronimo-assembly-archetype</module>
     </modules>
 
     <reporting>



Mime
View raw message