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 2007/01/09 00:35:22 UTC
svn commit: r494256 - in /geronimo/server/trunk/assemblies:
geronimo-boilerplate-j2ee/ geronimo-boilerplate-jee5/pom.xml
geronimo-boilerplate-jee5/src/main/resources/var/ pom.xml
Author: jdillon
Date: Mon Jan 8 15:35:21 2007
New Revision: 494256
URL: http://svn.apache.org/viewvc?view=rev&rev=494256
Log:
Eliminate geronimo-boilerplate-j2ee (merged into geronimo-boilerplate-jee5)
Added:
geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/src/main/resources/var/
- copied from r494216, geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/src/main/resources/var/
Removed:
geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/
Modified:
geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml
geronimo/server/trunk/assemblies/pom.xml
Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml?view=diff&rev=494256&r1=494255&r2=494256
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-jee5/pom.xml Mon Jan 8 15:35:21 2007
@@ -41,11 +41,14 @@
<build>
<plugins>
-<!--
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>car-maven-plugin</artifactId>
<executions>
+ <!--
+ NOTE: Need to install some extra bits into the repository which do not
+ normally make it there with the default car config installation.
+ -->
<execution>
<id>install-repository</id>
<phase>compile</phase>
@@ -55,20 +58,58 @@
<configuration>
<repositoryDirectory>${project.build.outputDirectory}/repository</repositoryDirectory>
<artifacts>
-
<artifact>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-persistence-jpa10</artifactId>
- <version>${pom.version}</version>
+ <artifactId>ge-activemq-rar</artifactId>
+ <version>${version}</version>
+ <type>rar</type>
+ </artifact>
+
+ <artifact>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-ra</artifactId>
+ <type>rar</type>
+ </artifact>
+
+ <artifact>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-derby-embed-local</artifactId>
+ <type>rar</type>
+ </artifact>
+
+ <artifact>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-derby-embed-xa</artifactId>
+ <type>rar</type>
+ </artifact>
+
+ <artifact>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-derby-client-local</artifactId>
+ <type>rar</type>
+ </artifact>
+
+ <artifact>
+ <groupId>org.tranql</groupId>
+ <artifactId>tranql-connector-derby-client-xa</artifactId>
+ <type>rar</type>
+ </artifact>
+
+ <artifact>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbyclient</artifactId>
</artifact>
+ <artifact>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ </artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
--->
-
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>dependency-maven-plugin</artifactId>
@@ -83,15 +124,36 @@
<artifactItems>
<artifactItem>
<groupId>org.apache.geronimo.assemblies</groupId>
- <artifactId>geronimo-boilerplate-j2ee</artifactId>
- <version>${pom.version}</version>
+ <artifactId>geronimo-boilerplate-minimal</artifactId>
+ <version>${version}</version>
<type>jar</type>
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/boilerplate</outputDirectory>
</configuration>
</execution>
-
+
+ <execution>
+ <id>install-lib-endorsed</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-spec-corba</artifactId>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-rmi-spec</artifactId>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>${project.build.directory}/classes/lib/endorsed</outputDirectory>
+ </configuration>
+ </execution>
+
<execution>
<id>install-lib</id>
<phase>compile</phase>
Modified: geronimo/server/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/pom.xml?view=diff&rev=494256&r1=494255&r2=494256
==============================================================================
--- geronimo/server/trunk/assemblies/pom.xml (original)
+++ geronimo/server/trunk/assemblies/pom.xml Mon Jan 8 15:35:21 2007
@@ -69,13 +69,12 @@
<modules>
<module>geronimo-boilerplate-minimal</module>
- <module>geronimo-boilerplate-j2ee</module>
<module>geronimo-boilerplate-jee5</module>
<module>geronimo-framework</module>
<module>geronimo-jetty6-minimal</module>
<module>geronimo-jetty6-jee5</module>
- <module>geronimo-tomcat6-jee5</module>
<module>geronimo-tomcat6-minimal</module>
+ <module>geronimo-tomcat6-jee5</module>
</modules>
</project>