geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r833817 - in /geronimo/server/trunk: framework/ framework/bundles/ framework/bundles/plexus-archiver/ framework/bundles/plexus-logging/ framework/bundles/plexus-utils/ plugins/ plugins/system-database/geronimo-derby/ plugins/system-database...
Date Sun, 08 Nov 2009 03:33:59 GMT
Author: djencks
Date: Sun Nov  8 03:33:58 2009
New Revision: 833817

URL: http://svn.apache.org/viewvc?rev=833817&view=rev
Log:
Make default to build only working plugins, build our bundles by default, remove some unused
plexus-* bundles

Added:
    geronimo/server/trunk/framework/bundles/pom.xml   (with props)
Removed:
    geronimo/server/trunk/framework/bundles/plexus-archiver/
    geronimo/server/trunk/framework/bundles/plexus-logging/
    geronimo/server/trunk/framework/bundles/plexus-utils/
Modified:
    geronimo/server/trunk/framework/pom.xml
    geronimo/server/trunk/plugins/pom.xml
    geronimo/server/trunk/plugins/system-database/geronimo-derby/pom.xml
    geronimo/server/trunk/plugins/system-database/system-database/pom.xml

Added: geronimo/server/trunk/framework/bundles/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/bundles/pom.xml?rev=833817&view=auto
==============================================================================
--- geronimo/server/trunk/framework/bundles/pom.xml (added)
+++ geronimo/server/trunk/framework/bundles/pom.xml Sun Nov  8 03:33:58 2009
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.framework</groupId>
+        <artifactId>framework</artifactId>
+        <version>3.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.framework</groupId>
+    <artifactId>bundles</artifactId>
+    <name>Geronimo bundles repackaging</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>asm-3.1</module>
+        <module>asm-commons-3.1</module>
+        <module>aspectjrt</module>
+        <module>aspectjweaver</module>
+        <module>castor</module>
+        <module>commons-cli</module>
+        <module>derbynet</module>
+        <module>derbytools</module>
+        <module>ldapsdk</module>
+        <!-- todo remove -->
+        <module>log4j</module>
+        <module>sxc-jaxb</module>
+        <module>sxc-runtime</module>
+        <module>wadi-aop</module>
+        <module>wadi-core</module>
+        <module>wadi-group</module>
+        <module>wadi-tribes</module>
+    </modules>
+</project>

Propchange: geronimo/server/trunk/framework/bundles/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/framework/bundles/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/framework/bundles/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=833817&r1=833816&r2=833817&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Sun Nov  8 03:33:58 2009
@@ -415,6 +415,7 @@
             </activation>
 
             <modules>
+                <module>bundles</module>
                 <module>modules</module>
                 <module>buildsupport</module>
                 <module>configs</module>

Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=833817&r1=833816&r2=833817&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Sun Nov  8 03:33:58 2009
@@ -90,7 +90,50 @@
             </plugin>
         </plugins>
     </build>
-    <profiles> 
+
+    <modules>
+        <!-- MNG-4052 modules used as import-scope need to be before anything that uses
them -->
+        <!--<module>pluto</module>-->
+        <!--<module>system-database</module>-->
+        <!--<module>activemq</module>-->
+        <!--<module>aspectj</module>-->
+        <!--<module>axis</module>-->
+        <!--<module>axis2</module>-->
+        <!--<module>client</module>-->
+        <!--<module>clustering</module>-->
+        <module>connector-1_6</module>
+        <!--<module>console</module>-->
+        <!--<module>corba</module>-->
+        <!--<module>cxf</module>-->
+        <!--<module>derby</module>-->
+        <!--<module>dojo</module>-->
+        <!--<module>debugviews</module>-->
+        <!--<module>hotdeploy</module>-->
+        <module>j2ee</module>
+        <!--<module>jasper</module>-->
+        <!--<module>javamail</module>-->
+        <!--<module>jaxws</module>-->
+        <!--<module>myfaces</module>-->
+        <!--<module>openejb</module>-->
+        <!--<module>openjpa2</module>-->
+<!--        <module>openwebbeans</module>-->
+        <!--<module>plancreator</module>-->
+        <!--<module>webservices</module>-->
+        <!--<module>spring</module>-->
+        <!--<module>ca-helper</module>-->
+        <!--<module>uddi</module>-->
+        <!--<module>mejb</module>-->
+        <!--<module>monitoring</module>-->
+        <!--<module>remote-deploy</module>-->
+        <!--<module>sharedlib</module>-->
+        <!--<module>welcome</module>-->
+        <!--<module>concurrent</module>-->
+        <!--<module>procrun</module>-->
+        <!--<module>jetty7</module>-->
+        <module>tomcat</module>
+    </modules>
+
+    <profiles>
         <profile>
             <id>ibmjdk</id>
             <!-- see GERONIMO-4763.  Apparently the tools.jar needs to be specifically
referenced on ibm jdks -->
@@ -123,9 +166,6 @@
         </profile>
         <profile>
             <id>all</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
             <modules>
                 <!-- MNG-4052 modules used as import-scope need to be before anything
that uses them -->
                 <module>pluto</module>
@@ -168,49 +208,5 @@
                 <module>tomcat</module>
             </modules>
         </profile>
-        <profile>
-            <id>working</id>
-            <modules>
-                <!-- MNG-4052 modules used as import-scope need to be before anything
that uses them -->
-                <!--<module>pluto</module>-->
-                <!--<module>system-database</module>-->
-                <!--<module>activemq</module>-->
-                <!--<module>aspectj</module>-->
-                <!--<module>axis</module>-->
-                <!--<module>axis2</module>-->
-                <!--<module>client</module>-->
-                <!--<module>clustering</module>-->
-                <module>connector-1_6</module>
-                <!--<module>console</module>-->
-                <!--<module>corba</module>-->
-                <!--<module>cxf</module>-->
-                <module>derby</module>
-                <!--<module>dojo</module>-->
-                <!--<module>debugviews</module>-->
-                <!--<module>hotdeploy</module>-->
-                <module>j2ee</module>
-                <!--<module>jasper</module>-->
-                <!--<module>javamail</module>-->
-                <!--<module>jaxws</module>-->
-                <!--<module>myfaces</module>-->
-                <!--<module>openejb</module>-->
-                <!--<module>openjpa2</module>-->
-        <!--        <module>openwebbeans</module>-->
-                <!--<module>plancreator</module>-->
-                <!--<module>webservices</module>-->
-                <!--<module>spring</module>-->
-                <!--<module>ca-helper</module>-->
-                <!--<module>uddi</module>-->
-                <!--<module>mejb</module>-->
-                <!--<module>monitoring</module>-->
-                <!--<module>remote-deploy</module>-->
-                <!--<module>sharedlib</module>-->
-                <!--<module>welcome</module>-->
-                <!--<module>concurrent</module>-->
-                <!--<module>procrun</module>-->
-                <!--<module>jetty7</module>-->
-                <module>tomcat</module>
-            </modules>
-        </profile>
     </profiles>
 </project>

Modified: geronimo/server/trunk/plugins/system-database/geronimo-derby/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/geronimo-derby/pom.xml?rev=833817&r1=833816&r2=833817&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/geronimo-derby/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/geronimo-derby/pom.xml Sun Nov  8 03:33:58
2009
@@ -37,13 +37,29 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
+            <groupId>org.apache.derby</groupId>
             <artifactId>derby</artifactId>
-            <version>${version}</version>
-            <type>car</type>
         </dependency>
 
         <dependency>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derbyclient</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>derbynet</artifactId>
+            <version>${derbyVersion}-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>derbytools</artifactId>
+            <version>${derbyVersion}-SNAPSHOT</version>
+        </dependency>
+
+
+        <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-system</artifactId>
             <version>${version}</version>

Modified: geronimo/server/trunk/plugins/system-database/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database/pom.xml?rev=833817&r1=833816&r2=833817&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/system-database/pom.xml Sun Nov  8 03:33:58
2009
@@ -38,16 +38,17 @@
     </description>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-interceptor_3.0_spec</artifactId>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.specs</groupId>-->
+            <!--<artifactId>geronimo-interceptor_3.0_spec</artifactId>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>org.apache.geronimo.framework</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -55,6 +56,7 @@
             <artifactId>j2ee-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -62,13 +64,7 @@
             <artifactId>connector-deployer-1_6</artifactId>
             <version>${version}</version>
             <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>derby</artifactId>
-            <version>${version}</version>
-            <type>car</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -88,13 +84,14 @@
             <groupId>org.tranql</groupId>
             <artifactId>tranql-connector-derby-embed-xa</artifactId>
             <type>rar</type>
+            <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.framework</groupId>
-            <artifactId>geronimo-service-builder</artifactId>
-            <version>${version}</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>org.apache.geronimo.framework</groupId>-->
+            <!--<artifactId>geronimo-service-builder</artifactId>-->
+            <!--<version>${version}</version>-->
+        <!--</dependency>-->
 
     </dependencies>
 



Mime
View raw message