geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akulshresh...@apache.org
Subject svn commit: r496084 - in /geronimo/server/trunk/modules: geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ geronimo-naming-builder/ geronimo-web-2.5-builder/src/site/ geronimo-web-2.5-builder/src/test/java/org/apache/ge...
Date Sun, 14 Jan 2007 14:33:37 GMT
Author: akulshreshtha
Date: Sun Jan 14 06:33:36 2007
New Revision: 496084

URL: http://svn.apache.org/viewvc?view=rev&rev=496084
Log:
GERONIMO-2723 - added site and tests to web-2.5-builder
              - Dependency pruning in naming-builder
              - Fixed cut-paste error 

Added:
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/site/
      - copied from r495566, geronimo/server/trunk/modules/geronimo-web-builder/src/site/
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web/
      - copied from r495566, geronimo/server/trunk/modules/geronimo-web-builder/src/test/java/org/apache/geronimo/web/
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/deployables/
      - copied from r495566, geronimo/server/trunk/modules/geronimo-web-builder/src/test/resources/deployables/
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/resources/plans/
      - copied from r495566, geronimo/server/trunk/modules/geronimo-web-builder/src/test/resources/plans/
Removed:
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/test/java/org/apache/geronimo/web/deployment/SchemaConversionTest.java
Modified:
    geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
    geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml

Modified: geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java?view=diff&rev=496084&r1=496083&r2=496084
==============================================================================
--- geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ResourceRefBuilder.java
Sun Jan 14 06:33:36 2007
@@ -209,7 +209,7 @@
         return GER_RESOURCE_REF_QNAME_SET;
     }
 
-    protected static String getStringValue(org.apache.geronimo.xbeans.j2ee.String string)
{
+    private static String getStringValue(org.apache.geronimo.xbeans.j2ee.String string) {
         if (string == null) {
             return null;
         }

Modified: geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml?view=diff&rev=496084&r1=496083&r2=496084
==============================================================================
--- geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-naming-builder/pom.xml Sun Jan 14 06:33:36 2007
@@ -33,37 +33,9 @@
     <name>Geronimo :: Naming :: Builder</name>
     
     <dependencies>
-        
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-common</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-deployment</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-deploy-config</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>geronimo-j2ee</artifactId>
-            <version>${version}</version>
-        </dependency>
 
+        <!-- g-kernel, g-common, g-j2ee coming from this via g-security -->
+        <!-- g-deployment, g-deploy-config coming from this via g-service-builder -->
         <dependency>
             <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-j2ee-builder</artifactId>

Modified: geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml?view=diff&rev=496084&r1=496083&r2=496084
==============================================================================
--- geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-webservices-builder/pom.xml Sun Jan 14 06:33:36
2007
@@ -46,12 +46,6 @@
             <artifactId>geronimo-naming-builder</artifactId>
             <version>${version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.schema</groupId>
-            <artifactId>geronimo-schema-j2ee_1.4</artifactId>
-        </dependency>
-
         
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>



Mime
View raw message