geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r615087 - in /geronimo/plugins/roller/trunk: geronimo-jetty-roller/pom.xml geronimo-tomcat-roller/pom.xml
Date Fri, 25 Jan 2008 00:36:33 GMT
Author: djencks
Date: Thu Jan 24 16:36:31 2008
New Revision: 615087

URL: http://svn.apache.org/viewvc?rev=615087&view=rev
Log:
make the demo servers smaller by starting with boilerplate, not framework

Modified:
    geronimo/plugins/roller/trunk/geronimo-jetty-roller/pom.xml
    geronimo/plugins/roller/trunk/geronimo-tomcat-roller/pom.xml

Modified: geronimo/plugins/roller/trunk/geronimo-jetty-roller/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/geronimo-jetty-roller/pom.xml?rev=615087&r1=615086&r2=615087&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/geronimo-jetty-roller/pom.xml (original)
+++ geronimo/plugins/roller/trunk/geronimo-jetty-roller/pom.xml Thu Jan 24 16:36:31 2008
@@ -40,11 +40,9 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.assemblies</groupId>
-            <artifactId>geronimo-framework</artifactId>
+            <artifactId>geronimo-boilerplate-minimal</artifactId>
             <version>${geronimoVersion}</version>
-            <type>zip</type>
-            <classifier>bin</classifier>
-            <scope>provided</scope>
+            <type>jar</type>
         </dependency>
 
         <dependency>
@@ -62,64 +60,8 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
 
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>unpack-boilerplate</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.assemblies</groupId>
-                                    <artifactId>geronimo-framework</artifactId>
-                                    <version>${geronimoVersion}</version>
-                                    <type>tar.gz</type>
-                                    <classifier>bin</classifier>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/unpack</outputDirectory>
-                        </configuration>
-                    </execution>
-
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-framework</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <!-- remove geronimo-framework-${version} prefix -->
-                                <mkdir dir="${project.build.directory}/assembly"/>
-                                <copy todir="${project.build.directory}/assembly">
-                                    <fileset dir="${project.build.directory}/unpack/geronimo-framework-${geronimoVersion}">
-                                    </fileset>
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
@@ -145,6 +87,25 @@
                         <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>

Modified: geronimo/plugins/roller/trunk/geronimo-tomcat-roller/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/roller/trunk/geronimo-tomcat-roller/pom.xml?rev=615087&r1=615086&r2=615087&view=diff
==============================================================================
--- geronimo/plugins/roller/trunk/geronimo-tomcat-roller/pom.xml (original)
+++ geronimo/plugins/roller/trunk/geronimo-tomcat-roller/pom.xml Thu Jan 24 16:36:31 2008
@@ -40,11 +40,9 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.assemblies</groupId>
-            <artifactId>geronimo-framework</artifactId>
+            <artifactId>geronimo-boilerplate-minimal</artifactId>
             <version>${geronimoVersion}</version>
-            <type>zip</type>
-            <classifier>bin</classifier>
-            <scope>provided</scope>
+            <type>jar</type>
         </dependency>
 
         <dependency>
@@ -63,64 +61,8 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
 
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>unpack-boilerplate</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.geronimo.assemblies</groupId>
-                                    <artifactId>geronimo-framework</artifactId>
-                                    <version>${geronimoVersion}</version>
-                                    <type>tar.gz</type>
-                                    <classifier>bin</classifier>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/unpack</outputDirectory>
-                        </configuration>
-                    </execution>
-
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-framework</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <!-- remove geronimo-framework-${version} prefix -->
-                                <mkdir dir="${project.build.directory}/assembly"/>
-                                <copy todir="${project.build.directory}/assembly">
-                                    <fileset dir="${project.build.directory}/unpack/geronimo-framework-${geronimoVersion}">
-                                    </fileset>
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
@@ -146,6 +88,25 @@
                         <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>



Mime
View raw message