geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r424014 - in /geronimo/branches/1.1: applications/magicGball/ modules/console-web/src/webapp/WEB-INF/ modules/j2ee-schema/src/test-data/geronimo/ modules/jetty/src/test-resources/deployables/war1/WEB-INF/ modules/jetty/src/test-resources/de...
Date Thu, 20 Jul 2006 18:21:19 GMT
Author: sppatel
Date: Thu Jul 20 11:21:17 2006
New Revision: 424014

URL: http://svn.apache.org/viewvc?rev=424014&view=rev
Log:
GERONIMO-1492

Modified:
    geronimo/branches/1.1/applications/magicGball/maven.xml
    geronimo/branches/1.1/modules/console-web/src/webapp/WEB-INF/geronimo-web.xml
    geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-post.xml
    geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-pre.xml
    geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/gbean-post.xml
    geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/gbean-pre.xml
    geronimo/branches/1.1/modules/jetty/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
    geronimo/branches/1.1/modules/jetty/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/StartupMonitorUtil.java
    geronimo/branches/1.1/modules/system/src/schema/local-attributes-1.1.xsd
    geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
    geronimo/branches/1.1/modules/tomcat/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
    geronimo/branches/1.1/modules/tomcat/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
    geronimo/branches/1.1/modules/web-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
    geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-post.xml
    geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre.xml
    geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre2.xml
    geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre3.xml

Modified: geronimo/branches/1.1/applications/magicGball/maven.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/applications/magicGball/maven.xml?rev=424014&r1=424013&r2=424014&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/magicGball/maven.xml (original)
+++ geronimo/branches/1.1/applications/magicGball/maven.xml Thu Jul 20 11:21:17 2006
@@ -100,7 +100,7 @@
             username="system"
             password="manager"
             maxtries="125"
-            id="org/apache/geronimo/RuntimeDeployer"/>
+            id="geronimo/geronimo-gbean-deployer/${pom.currentVersion}/car"/>
         <echo message="runtime deployer has started"/>
         <u:sleep millis="7000"/>
     </goal>
@@ -117,21 +117,21 @@
             uri="deployer:geronimo:jmx"
             username="system"
             password="manager"
-            id="org/apache/geronimo/MagicGBallCorba"/>
+            id="geronimo/magicGBall-corba-ssl/${pom.currentVersion}/car"/>
     </goal>
     <goal name="stopAppSSL">
         <deploy:stop
             uri="deployer:geronimo:jmx"
             username="system"
             password="manager"
-            id="org/apache/geronimo/MagicGBallCorba"/>
+            id="geronimo/magicGBall-corba-ssl/${pom.currentVersion}/car"/>
     </goal>
     <goal name="undeployAppSSL">
         <deploy:undeploy
             uri="deployer:geronimo:jmx"
             username="system"
             password="manager"
-            id="org/apache/geronimo/MagicGBallCorba"/>
+            id="geronimo/magicGBall-corba-ssl/${pom.currentVersion}/car"/>
     </goal>
 
     <goal name="runClientSSL" prereqs="initVars">
@@ -163,21 +163,21 @@
             uri="deployer:geronimo:jmx"
             username="system"
             password="manager"
-            id="org/apache/geronimo/MagicGBallCorbaNoSec"/>
+            id="geronimo/magicGBall-corba-nosec/${pom.currentVersion}/car"/>
     </goal>
     <goal name="stopAppNoSec">
         <deploy:stop
             uri="deployer:geronimo:jmx"
             username="system"
             password="manager"
-            id="org/apache/geronimo/MagicGBallCorbaNoSec"/>
+            id="geronimo/magicGBall-corba-nosec/${pom.currentVersion}/car"/>
     </goal>
     <goal name="undeployAppNoSec">
         <deploy:undeploy
             uri="deployer:geronimo:jmx"
             username="system"
             password="manager"
-            id="org/apache/geronimo/MagicGBallCorbaNoSec"/>
+            id="geronimo/magicGBall-corba-nosec/${pom.currentVersion}/car"/>
     </goal>
 
     <goal name="runClientNoSec" prereqs="initVars">

Modified: geronimo/branches/1.1/modules/console-web/src/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/console-web/src/webapp/WEB-INF/geronimo-web.xml?rev=424014&r1=424013&r2=424014&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/console-web/src/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/branches/1.1/modules/console-web/src/webapp/WEB-INF/geronimo-web.xml Thu Jul
20 11:21:17 2006
@@ -17,10 +17,18 @@
 -->
   
 <web-app
-    xmlns="http://geronimo.apache.org/xml/ns/web"
-    configId="org/apache/geronimo/DebugConsole"
-    parentId="org/apache/geronimo/Server"
-    >
+    xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
+    <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+      <dep:moduleId>
+        <dep:groupId>geronimo</dep:groupId>
+        <dep:artifactId>console-web</dep:artifactId>
+        <dep:version>1.0</dep:version>
+        <dep:type>war</dep:type>
+      </dep:moduleId>
+      <dep:dependencies/>
+      <dep:hidden-classes/>
+      <dep:non-overridable-classes/>
+    </dep:environment>
     <context-root>/debug-tool</context-root>
     <context-priority-classloader>false</context-priority-classloader>
 </web-app>

Modified: geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-post.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-post.xml?rev=424014&r1=424013&r2=424014&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-post.xml (original)
+++ geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-post.xml Thu
Jul 20 11:21:17 2006
@@ -10,9 +10,10 @@
         </dep:moduleId>
     </dep:environment>
     <nam:cmp-connection-factory>
-        <nam:application>null</nam:application>
-        <nam:module>org/apache/geronimo/DefaultDatabase</nam:module>
-        <nam:name>DefaultDatasource</nam:name>
+        <nam:pattern>
+            <nam:groupId>geronimo</nam:groupId>
+            <nam:artifactId>system-database</nam:artifactId>
+        </nam:pattern>
     </nam:cmp-connection-factory>
     <enterprise-beans>
         <!--

Modified: geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-pre.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-pre.xml?rev=424014&r1=424013&r2=424014&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-pre.xml (original)
+++ geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-pre.xml Thu
Jul 20 11:21:17 2006
@@ -13,9 +13,10 @@
     </environment>
 
     <cmp-connection-factory>
-        <application>null</application>
-        <module>org/apache/geronimo/DefaultDatabase</module>
-        <name>DefaultDatasource</name>
+        <pattern>
+            <groupId>geronimo</groupId>
+            <artifactId>system-database</artifactId>
+        </pattern>
     </cmp-connection-factory>
 
     <enterprise-beans>
@@ -231,4 +232,4 @@
         </entity>
     </enterprise-beans>
 
-</openejb-jar>
\ No newline at end of file
+</openejb-jar>

Modified: geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/gbean-post.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/gbean-post.xml?rev=424014&r1=424013&r2=424014&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/gbean-post.xml (original)
+++ geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/gbean-post.xml Thu Jul
20 11:21:17 2006
@@ -29,8 +29,11 @@
             </css:compoundSecMechTypeList>
         </css:css>
     </xml-attribute>
+    <dependency>
+      <groupId>geronimo</groupId>
+      <artifactId>client</artifactId>
+    </dependency>
     <reference name="ServerInfo">
-        <module>org/apache/geronimo/ClientSystem</module>
         <name>ServerInfo</name>
     </reference>
     <reference name="LoginService">

Modified: geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/gbean-pre.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/gbean-pre.xml?rev=424014&r1=424013&r2=424014&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/gbean-pre.xml (original)
+++ geronimo/branches/1.1/modules/j2ee-schema/src/test-data/geronimo/gbean-pre.xml Thu Jul
20 11:21:17 2006
@@ -29,8 +29,11 @@
             </css:compoundSecMechTypeList>
         </css:css>
     </xml-attribute>
+    <dependency>
+      <groupId>geronimo</groupId>
+      <artifactId>client</artifactId>
+    </dependency>
     <reference name="ServerInfo">
-        <module>org/apache/geronimo/ClientSystem</module>
         <name>ServerInfo</name>
     </reference>
     <reference name="LoginService">

Modified: geronimo/branches/1.1/modules/jetty/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/jetty/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml?rev=424014&r1=424013&r2=424014&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/branches/1.1/modules/jetty/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
Thu Jul 20 11:21:17 2006
@@ -17,9 +17,20 @@
 -->
 
 <jetty:web-app
-    xmlns:jetty="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
-    configId="org/apache/geronimo/jetty/Test"
+    xmlns:jetty="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1"
     >
+    <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+      <dep:moduleId>
+        <dep:groupId>geronimo</dep:groupId>
+        <dep:artifactId>jetty-test</dep:artifactId>
+        <dep:version>1.0</dep:version>
+        <dep:type>war</dep:type>
+      </dep:moduleId>
+      <dep:dependencies/>
+      <dep:hidden-classes/>
+      <dep:non-overridable-classes/>
+    </dep:environment>
+
     <jetty:context-root>/test</jetty:context-root>
     <jetty:context-priority-classloader>false</jetty:context-priority-classloader>
     <!--

Modified: geronimo/branches/1.1/modules/jetty/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/jetty/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml?rev=424014&r1=424013&r2=424014&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/jetty/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/branches/1.1/modules/jetty/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
Thu Jul 20 11:21:17 2006
@@ -17,9 +17,19 @@
 -->
 
 <web-app
-    xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
-    xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
-    configId="org/apache/geronimo/test">
+    xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1"
+    xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+    <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+      <dep:moduleId>
+        <dep:groupId>geronimo</dep:groupId>
+        <dep:artifactId>jetty-test</dep:artifactId>
+        <dep:version>1.0</dep:version>
+        <dep:type>war</dep:type>
+      </dep:moduleId>
+      <dep:dependencies/>
+      <dep:hidden-classes/>
+      <dep:non-overridable-classes/>
+    </dep:environment>
 
     <context-root>/test</context-root>
     <context-priority-classloader>false</context-priority-classloader>

Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/StartupMonitorUtil.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/StartupMonitorUtil.java?rev=424014&r1=424013&r2=424014&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/StartupMonitorUtil.java
(original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/StartupMonitorUtil.java
Thu Jul 20 11:21:17 2006
@@ -218,7 +218,7 @@
         String app = abstractName.getNameProperty("J2EEApplication");
         String name = abstractName.getNameProperty("name");
         if (type != null && (app == null || app.equals("null"))) {
-            return (type.equals("WebModule") || type.equals("J2EEApplication") || type.equals("EJBModule")
|| type.equals("AppClientModule") || type.equals("ResourceAdapterModule")) && !name.startsWith("org/apache/geronimo/System");
+            return (type.equals("WebModule") || type.equals("J2EEApplication") || type.equals("EJBModule")
|| type.equals("AppClientModule") || type.equals("ResourceAdapterModule")) && !name.startsWith("geronimo/system");
           
         }
         return false;
     }

Modified: geronimo/branches/1.1/modules/system/src/schema/local-attributes-1.1.xsd
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/system/src/schema/local-attributes-1.1.xsd?rev=424014&r1=424013&r2=424014&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/schema/local-attributes-1.1.xsd (original)
+++ geronimo/branches/1.1/modules/system/src/schema/local-attributes-1.1.xsd Thu Jul 20 11:21:17
2006
@@ -31,12 +31,12 @@
             Should look like this:
 
             <attributes>
-              <configuration name="org/apache/geronimo/Server">
-                <gbean name="SomeJettyConnector">
+              <module name="mygroup/mycomponent/1.1/jar">
+                <gbean name="MyNetworkService">
                   <attribute name="host">0.0.0.0</attribute>
-                  <attribute name="port">8080</attribute>
+                  <attribute name="port">1234</attribute>
                 </gbean>
-              </configuration>
+              </module>
             </attributes>
             ]]>
         </xsd:documentation>
@@ -72,7 +72,7 @@
                   Note that the name attribute for a gbean element may hold
                   either the full GBeanName, or only the value for the
                   "name=" portion of the GBeanName.  If there are multiple
-                  GBeans in the configuration with manageable attributes and
+                  GBeans in the module with manageable attributes and
                   the same "name=" portion of the GBeanName, then all must be
                   listed and all must be listed with a full GBeanName.
                 ]]>
@@ -114,4 +114,4 @@
         </xsd:sequence>
         <xsd:attribute name="name" type="xsd:string"/>
     </xsd:complexType>
-  </xsd:schema>
\ No newline at end of file
+  </xsd:schema>

Modified: geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java?rev=424014&r1=424013&r2=424014&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
(original)
+++ geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
Thu Jul 20 11:21:17 2006
@@ -159,7 +159,7 @@
         PermissionCollection uncheckedPermissions= new Permissions();
         ComponentPermissions componentPermissions = new ComponentPermissions(excludedPermissions,
uncheckedPermissions, new HashMap());
         Map contextIDToPermissionsMap = new HashMap();
-        contextIDToPermissionsMap.put("test_J2EEApplication=null_J2EEServer=bar_j2eeType=WebModule_name=org/apache/geronimo/test",
componentPermissions);
+        contextIDToPermissionsMap.put("test_J2EEApplication=null_J2EEServer=bar_j2eeType=WebModule_name=geronimo/test/1.0/war",
componentPermissions);
         jaccBeanData.setAttribute("contextIdToPermissionsMap", contextIDToPermissionsMap);
 //        jaccBeanData.setAttribute("principalRoleMap", new HashMap());
         jaccBeanData.setAttribute("roleDesignates", new HashMap());

Modified: geronimo/branches/1.1/modules/tomcat/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/tomcat/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml?rev=424014&r1=424013&r2=424014&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/branches/1.1/modules/tomcat/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
Thu Jul 20 11:21:17 2006
@@ -16,10 +16,18 @@
     limitations under the License.
 -->
 
-<tomcat:web-app
-    xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
-    configId="org/apache/geronimo/tomcat/Test"
-    >
+<tomcat:web-app xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
+    <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+      <dep:moduleId>
+        <dep:groupId>geronimo</dep:groupId>
+        <dep:artifactId>tomcat-test</dep:artifactId>
+        <dep:version>1.0</dep:version>
+        <dep:type>war</dep:type>
+      </dep:moduleId>
+      <dep:dependencies/>
+      <dep:hidden-classes/>
+      <dep:non-overridable-classes/>
+    </dep:environment>
     <tomcat:context-root>/test</tomcat:context-root>
     <tomcat:context-priority-classloader>false</tomcat:context-priority-classloader>
     <!--

Modified: geronimo/branches/1.1/modules/tomcat/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/tomcat/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml?rev=424014&r1=424013&r2=424014&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/branches/1.1/modules/tomcat/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
Thu Jul 20 11:21:17 2006
@@ -17,9 +17,19 @@
 -->
 
 <web-app
-    xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
-    xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1"
-    configId="org/apache/geronimo/test">
+    xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1"
+    xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+    <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+      <dep:moduleId>
+        <dep:groupId>geronimo</dep:groupId>
+        <dep:artifactId>tomcat-test</dep:artifactId>
+        <dep:version>1.0</dep:version>
+        <dep:type>war</dep:type>
+      </dep:moduleId>
+      <dep:dependencies/>
+      <dep:hidden-classes/>
+      <dep:non-overridable-classes/>
+    </dep:environment>
 
     <context-root>/test</context-root>
     <context-priority-classloader>false</context-priority-classloader>

Modified: geronimo/branches/1.1/modules/web-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/web-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml?rev=424014&r1=424013&r2=424014&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/web-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
(original)
+++ geronimo/branches/1.1/modules/web-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
Thu Jul 20 11:21:17 2006
@@ -17,9 +17,20 @@
 -->
 
 <tomcat:web-app
-    xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
-    configId="org/apache/geronimo/tomcat/Test"
+    xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1"
     >
+    <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+      <dep:moduleId>
+        <dep:groupId>geronimo</dep:groupId>
+        <dep:artifactId>tomcat-test</dep:artifactId>
+        <dep:version>1.0</dep:version>
+        <dep:type>war</dep:type>
+      </dep:moduleId>
+      <dep:dependencies/>
+      <dep:hidden-classes/>
+      <dep:non-overridable-classes/>
+    </dep:environment>
+
     <tomcat:context-root>/test</tomcat:context-root>
     <tomcat:context-priority-classloader>false</tomcat:context-priority-classloader>
     <!--

Modified: geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-post.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-post.xml?rev=424014&r1=424013&r2=424014&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-post.xml (original)
+++ geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-post.xml Thu
Jul 20 11:21:17 2006
@@ -7,7 +7,12 @@
             <dep:artifactId>testclient</dep:artifactId>
             <dep:version>1</dep:version>
         </dep:moduleId>
-
+        <dep:dependencies>
+            <dep:dependency>
+                <dep:groupId>geronimo</dep:groupId>
+                <dep:artifactId>j2ee-system</dep:artifactId>
+            </dep:dependency>
+        </dep:dependencies>
     </dep:environment>
     <tom:context-priority-classloader>false</tom:context-priority-classloader>
     <tom:cross-context/>
@@ -38,7 +43,6 @@
             </lc:login-config>
         </dep:xml-reference>
         <dep:reference name="ServerInfo">
-            <dep:module>org/apache/geronimo/System</dep:module>
             <dep:name>ServerInfo</dep:name>
         </dep:reference>
         <dep:reference name="LoginService">

Modified: geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre.xml?rev=424014&r1=424013&r2=424014&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre.xml (original)
+++ geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre.xml Thu
Jul 20 11:21:17 2006
@@ -7,7 +7,12 @@
             <dep:artifactId>testclient</dep:artifactId>
             <dep:version>1</dep:version>
         </dep:moduleId>
-
+        <dep:dependencies>
+            <dep:dependency>
+                <dep:groupId>geronimo</dep:groupId>
+                <dep:artifactId>j2ee-system</dep:artifactId>
+            </dep:dependency>
+        </dep:dependencies>
     </dep:environment>
     <context-priority-classloader>false</context-priority-classloader>
     <container-config>
@@ -42,7 +47,6 @@
             </lc:login-config>
         </xml-reference>
         <reference name="ServerInfo">
-            <module>org/apache/geronimo/System</module>
             <name>ServerInfo</name>
         </reference>
         <reference name="LoginService">

Modified: geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre2.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre2.xml?rev=424014&r1=424013&r2=424014&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre2.xml (original)
+++ geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre2.xml Thu
Jul 20 11:21:17 2006
@@ -7,6 +7,12 @@
             <dep:artifactId>testclient</dep:artifactId>
             <dep:version>1</dep:version>
         </dep:moduleId>
+        <dep:dependencies>
+            <dep:dependency>
+                <dep:groupId>geronimo</dep:groupId>
+                <dep:artifactId>j2ee-system</dep:artifactId>
+            </dep:dependency>
+        </dep:dependencies>
     </dep:environment>
     <context-priority-classloader>false</context-priority-classloader>
     <container-config>
@@ -41,7 +47,6 @@
             </lc:login-config>
         </xml-reference>
         <reference name="ServerInfo">
-            <module>org/apache/geronimo/System</module>
             <name>ServerInfo</name>
         </reference>
         <reference name="LoginService">

Modified: geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre3.xml
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre3.xml?rev=424014&r1=424013&r2=424014&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre3.xml (original)
+++ geronimo/branches/1.1/modules/web-builder/src/test-resources/plans/tomcat-pre3.xml Thu
Jul 20 11:21:17 2006
@@ -7,6 +7,12 @@
             <dep:artifactId>testclient</dep:artifactId>
             <dep:version>1</dep:version>
         </dep:moduleId>
+        <dep:dependencies>
+            <dep:dependency>
+                <dep:groupId>geronimo</dep:groupId>
+                <dep:artifactId>j2ee-system</dep:artifactId>
+            </dep:dependency>
+        </dep:dependencies>
     </dep:environment>
     <context-priority-classloader>false</context-priority-classloader>
     <container-config>
@@ -41,7 +47,6 @@
             </lc:login-config>
         </xml-reference>
         <reference name="ServerInfo">
-            <module>org/apache/geronimo/System</module>
             <name>ServerInfo</name>
         </reference>
         <reference name="LoginService">



Mime
View raw message