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 2006/09/13 03:06:00 UTC

svn commit: r442779 - in /geronimo/server/trunk/assemblies: geronimo-boilerplate-j2ee/pom.xml geronimo-boilerplate-minimal/pom.xml

Author: jdillon
Date: Tue Sep 12 18:06:00 2006
New Revision: 442779

URL: http://svn.apache.org/viewvc?view=rev&rev=442779
Log:
Moved rar install to j2ee boilerplate

Modified:
    geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/pom.xml
    geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/pom.xml?view=diff&rev=442779&r1=442778&r2=442779
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-j2ee/pom.xml Tue Sep 12 18:06:00 2006
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2006 The Apache Software Foundation
-    
-    Licensed 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.
+    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$ -->
@@ -38,6 +41,75 @@
     
     <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>
+                        <goals>
+                            <goal>install-artifacts</goal>
+                        </goals>
+                        <configuration>
+                            <repositoryDirectory>${project.build.outputDirectory}/repository</repositoryDirectory>
+                            <artifacts>
+                                <artifact>
+                                    <groupId>org.apache.geronimo.modules</groupId>
+                                    <artifactId>ge-activemq-rar</artifactId>
+                                    <version>${pom.version}</version>
+                                    <type>rar</type>
+                                </artifact>
+                                
+                                <artifact>
+                                    <groupId>tranql</groupId>
+                                    <artifactId>tranql-connector</artifactId>
+                                    <type>rar</type>
+                                </artifact>
+                                
+                                <artifact>
+                                    <groupId>tranql</groupId>
+                                    <artifactId>tranql-connector-derby-embed-local</artifactId>
+                                    <type>rar</type>
+                                </artifact>
+                                
+                                <artifact>
+                                    <groupId>tranql</groupId>
+                                    <artifactId>tranql-connector-derby-embed-xa</artifactId>
+                                    <type>rar</type>
+                                </artifact>
+                                
+                                <artifact>
+                                    <groupId>tranql</groupId>
+                                    <artifactId>tranql-connector-derby-client-local</artifactId>
+                                    <type>rar</type>
+                                </artifact>
+                                
+                                <artifact>
+                                    <groupId>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>

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?view=diff&rev=442779&r1=442778&r2=442779
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate-minimal/pom.xml Tue Sep 12 18:06:00 2006
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2006 The Apache Software Foundation
-    
-    Licensed 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.
+    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$ -->
@@ -38,75 +41,6 @@
     
     <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>
-                        <goals>
-                            <goal>install-artifacts</goal>
-                        </goals>
-                        <configuration>
-                            <repositoryDirectory>${project.build.outputDirectory}/repository</repositoryDirectory>
-                            <artifacts>
-                                <artifact>
-                                    <groupId>org.apache.geronimo.modules</groupId>
-                                    <artifactId>ge-activemq-rar</artifactId>
-                                    <version>${pom.version}</version>
-                                    <type>rar</type>
-                                </artifact>
-                                
-                                <artifact>
-                                    <groupId>tranql</groupId>
-                                    <artifactId>tranql-connector</artifactId>
-                                    <type>rar</type>
-                                </artifact>
-                                
-                                <artifact>
-                                    <groupId>tranql</groupId>
-                                    <artifactId>tranql-connector-derby-embed-local</artifactId>
-                                    <type>rar</type>
-                                </artifact>
-                                
-                                <artifact>
-                                    <groupId>tranql</groupId>
-                                    <artifactId>tranql-connector-derby-embed-xa</artifactId>
-                                    <type>rar</type>
-                                </artifact>
-                                
-                                <artifact>
-                                    <groupId>tranql</groupId>
-                                    <artifactId>tranql-connector-derby-client-local</artifactId>
-                                    <type>rar</type>
-                                </artifact>
-                                
-                                <artifact>
-                                    <groupId>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>