You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2008/05/16 00:55:23 UTC
svn commit: r656889 - in /geronimo/server/trunk/assemblies:
geronimo-boilerplate-minimal/pom.xml geronimo-framework/pom.xml
Author: jdillon
Date: Thu May 15 15:55:23 2008
New Revision: 656889
URL: http://svn.apache.org/viewvc?rev=656889&view=rev
Log:
For simplicity just include the jetty + tomcat schemas in the boilerplate
Modified:
geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml?rev=656889&r1=656888&r2=656889&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml Thu May 15 15:55:23 2008
@@ -194,14 +194,12 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>unpack-schemas</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/schema</outputDirectory>
-
<artifactItems>
<artifactItem>
<groupId>org.apache.geronimo.framework</groupId>
@@ -258,6 +256,16 @@
<artifactId>geronimo-openejb-builder</artifactId>
<version>${version}</version>
</artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-tomcat6-builder</artifactId>
+ <version>${version}</version>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-jetty6-builder</artifactId>
+ <version>${version}</version>
+ </artifactItem>
</artifactItems>
</configuration>
</execution>
Modified: geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-framework/pom.xml?rev=656889&r1=656888&r2=656889&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-framework/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-framework/pom.xml Thu May 15 15:55:23 2008
@@ -58,15 +58,6 @@
<type>car</type>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>upgrade-cli</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
- -->
-
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>rmi-naming</artifactId>
@@ -101,108 +92,6 @@
<version>${version}</version>
<type>car</type>
</dependency>
-
- <!--
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>online-deployer</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
- -->
-
- <!--
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>offline-deployer</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
- -->
-
- <!--
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>jsr88-cli</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
- -->
-
- <!--
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>jsr88-deploymentfactory</artifactId>
- <version>${version}</version>
- <type>car</type>
- </dependency>
- -->
</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-schemas</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-tomcat6-builder</artifactId>
- <version>${version}</version>
- </artifactItem>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-jetty6-builder</artifactId>
- <version>${version}</version>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/scratch/schema</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>flatten-schemas</id>
- <phase>process-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <mkdir dir="${project.build.directory}/schema"/>
- <copy todir="${project.build.directory}/schema">
- <fileset dir="${project.build.directory}/scratch/schema">
- <include name="**/*.xsd"/>
- <include name="**/*.dtd"/>
- </fileset>
- <mapper type="flatten"/>
- </copy>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
+
</project>