geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r442980 - in /geronimo/server/branches/sachin: ./ assemblies/geronimo-boilerplate-j2ee/ assemblies/geronimo-boilerplate-minimal/ maven-plugins/geronimo-maven-plugin/ maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mave...
Date Wed, 13 Sep 2006 13:19:36 GMT
Author: sppatel
Date: Wed Sep 13 06:19:32 2006
New Revision: 442980

URL: http://svn.apache.org/viewvc?view=rev&rev=442980
Log:
merge from head

Added:
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/GeronimoMojoSupport.java
      - copied unchanged from r442979, geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/GeronimoMojoSupport.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ModuleConfig.java
      - copied unchanged from r442979, geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ModuleConfig.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/
      - copied from r442979, geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/DeployModuleMojo.java
      - copied unchanged from r442979, geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/DeployModuleMojo.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/DeployMojo.java
      - copied unchanged from r442979, geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/DeployMojo.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/ListModulesMojo.java
      - copied unchanged from r442979, geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/ListModulesMojo.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/ModuleMojoSupport.java
      - copied unchanged from r442979, geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/ModuleMojoSupport.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/StartModuleMojo.java
      - copied unchanged from r442979, geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/StartModuleMojo.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/StartStopUndeployMojoSupport.java
      - copied unchanged from r442979, geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/StartStopUndeployMojoSupport.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/StopModuleMojo.java
      - copied unchanged from r442979, geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/StopModuleMojo.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/UndeployModuleMojo.java
      - copied unchanged from r442979, geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/UndeployModuleMojo.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/UndeployMojo.java
      - copied unchanged from r442979, geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/module/UndeployMojo.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/
      - copied from r442979, geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallAssemblyMojo.java
      - copied unchanged from r442979, geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallAssemblyMojo.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallMojo.java
      - copied unchanged from r442979, geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallMojo.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java
      - copied unchanged from r442979, geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/InstallerMojoSupport.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartMojo.java
      - copied unchanged from r442979, geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartMojo.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
      - copied unchanged from r442979, geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StartServerMojo.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StopMojo.java
      - copied unchanged from r442979, geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StopMojo.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StopServerMojo.java
      - copied unchanged from r442979, geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/server/StopServerMojo.java
    geronimo/server/branches/sachin/testsuite/deployment-testsuite/
      - copied from r442979, geronimo/server/trunk/testsuite/deployment-testsuite/
    geronimo/server/branches/sachin/testsuite/deployment-testsuite/pom.xml
      - copied unchanged from r442979, geronimo/server/trunk/testsuite/deployment-testsuite/pom.xml
    geronimo/server/branches/sachin/testsuite/deployment-testsuite/test-deployments/
      - copied from r442979, geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/
    geronimo/server/branches/sachin/testsuite/deployment-testsuite/test-deployments/pom.xml
      - copied unchanged from r442979, geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/pom.xml
    geronimo/server/branches/sachin/testsuite/deployment-testsuite/test-deployments/src/
      - copied from r442979, geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/
    geronimo/server/branches/sachin/testsuite/deployment-testsuite/test-deployments/src/test/
      - copied from r442979, geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/
    geronimo/server/branches/sachin/testsuite/deployment-testsuite/test-deployments/src/test/java/
      - copied from r442979, geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/
    geronimo/server/branches/sachin/testsuite/deployment-testsuite/test-deployments/src/test/java/org/
      - copied from r442979, geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/
    geronimo/server/branches/sachin/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/
      - copied from r442979, geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/
    geronimo/server/branches/sachin/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/
      - copied from r442979, geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/
    geronimo/server/branches/sachin/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/
      - copied from r442979, geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/
    geronimo/server/branches/sachin/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/
      - copied from r442979, geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/
    geronimo/server/branches/sachin/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java
      - copied unchanged from r442979, geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear13Test.java
    geronimo/server/branches/sachin/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java
      - copied unchanged from r442979, geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/Ear14Test.java
    geronimo/server/branches/sachin/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/ExtendedSelenium.java
      - copied unchanged from r442979, geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/ExtendedSelenium.java
    geronimo/server/branches/sachin/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/SeleniumTestSupport.java
      - copied unchanged from r442979, geronimo/server/trunk/testsuite/deployment-testsuite/test-deployments/src/test/java/org/apache/geronimo/testsuite/deployment/SeleniumTestSupport.java
    geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/src/main/webapp/index.html
      - copied unchanged from r442979, geronimo/server/trunk/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/src/main/webapp/index.html
    geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/src/main/webapp/index.html
      - copied unchanged from r442979, geronimo/server/trunk/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/src/main/webapp/index.html
Removed:
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/InstallAssemblyMojo.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/InstallerMojoSupport.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ServerMojoSupport.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/StartServerMojo.java
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/StopServerMojo.java
    geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/src/main/resources/META-INF/application.xml
    geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-ear-j2ee_1.3/src/main/resources/META-INF/geronimo-application.xml
    geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/src/main/resources/META-INF/application.xml
    geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-ear-j2ee_1.4/src/main/resources/META-INF/geronimo-application.xml
Modified:
    geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-j2ee/pom.xml
    geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/pom.xml
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/pom.xml
    geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ServerProxy.java
    geronimo/server/branches/sachin/modules/ge-activemq-rar/pom.xml
    geronimo/server/branches/sachin/modules/geronimo-axis/src/main/java/org/apache/geronimo/axis/client/ServiceEndpointMethodInterceptor.java
    geronimo/server/branches/sachin/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/SubjectInterceptor.java
    geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/pom.xml
    geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/main/resources/META-INF/geronimo-dependency.xml
    geronimo/server/branches/sachin/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ContextManager.java
    geronimo/server/branches/sachin/pom.xml
    geronimo/server/branches/sachin/testsuite/console-testsuite/pom.xml
    geronimo/server/branches/sachin/testsuite/pom.xml
    geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-ejb-j2ee_1.3/src/main/resources/META-INF/openejb-jar.xml
    geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/src/main/rar/META-INF/geronimo-ra.xml
    geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/src/main/resources/META-INF/openejb-jar.xml
    geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/src/main/rar/META-INF/geronimo-ra.xml
    geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/src/main/webapp/WEB-INF/geronimo-web.xml

Modified: geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-j2ee/pom.xml?view=diff&rev=442980&r1=442979&r2=442980
==============================================================================
--- geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-j2ee/pom.xml (original)
+++ geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-j2ee/pom.xml Wed Sep 13 06:19:32 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/branches/sachin/assemblies/geronimo-boilerplate-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/pom.xml?view=diff&rev=442980&r1=442979&r2=442980
==============================================================================
--- geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/branches/sachin/assemblies/geronimo-boilerplate-minimal/pom.xml Wed Sep 13 06:19:32 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>

Modified: geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/pom.xml?view=diff&rev=442980&r1=442979&r2=442980
==============================================================================
--- geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/pom.xml (original)
+++ geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/pom.xml Wed Sep 13 06:19:32 2006
@@ -40,6 +40,12 @@
     </description>
 
     <dependencies>
+      <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>

Modified: geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ServerProxy.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ServerProxy.java?view=diff&rev=442980&r1=442979&r2=442980
==============================================================================
--- geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ServerProxy.java (original)
+++ geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ServerProxy.java Wed Sep 13 06:19:32 2006
@@ -64,12 +64,12 @@
         init(url, environment);
     }
 
-    public ServerProxy(final int port, final String username, final String password) throws Exception {
+    public ServerProxy(final String hostname, final int port, final String username, final String password) throws Exception {
         //
-        // FIXME: Should be able to pass in hostname too
+        // TODO: Check if this is the right way to build up the URI
         //
         
-        this("service:jmx:rmi://localhost/jndi/rmi://localhost:" + port + "/JMXConnector", username, password);
+        this("service:jmx:rmi://" + hostname + "/jndi/rmi://" + hostname + ":" + port + "/JMXConnector", username, password);
     }
 
     public ServerProxy(final String url, final String username, final String password) throws Exception {
@@ -142,8 +142,6 @@
     }
 
     public void shutdown() {
-        log.info("Attempting to shutdown the remote server");
-        
         try {
             invoke("shutdown");
         }

Modified: geronimo/server/branches/sachin/modules/ge-activemq-rar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/ge-activemq-rar/pom.xml?view=diff&rev=442980&r1=442979&r2=442980
==============================================================================
--- geronimo/server/branches/sachin/modules/ge-activemq-rar/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/ge-activemq-rar/pom.xml Wed Sep 13 06:19:32 2006
@@ -30,19 +30,142 @@
 
     <artifactId>ge-activemq-rar</artifactId>
     <name>Geronimo :: ActiveMQ Embedded RAR</name>
-    <description>Resource Adapter configuration for using ActiveMQ as a bundled JMS provider.</description>
     <packaging>rar</packaging>
     
+    <description>
+        Resource Adapter configuration for using ActiveMQ as a bundled JMS provider.
+    </description>
+    
+    <!--
+    NOTE: Excluding depenedencies which are already included in the server's repository
+          or are uneeded by the runtime.
+    -->
+    
     <dependencies>
         
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>mx4j</groupId>
+                    <artifactId>mx4j</artifactId>
+                </exclusion>
+                
+                <exclusion>
+                    <groupId>mx4j</groupId>
+                    <artifactId>mx4j-impl</artifactId>
+                </exclusion>
+                
+                <exclusion>
+                    <groupId>mx4j</groupId>
+                    <artifactId>mx4j-remote</artifactId>
+                </exclusion>
+                
+                <exclusion>
+                    <groupId>mx4j</groupId>
+                    <artifactId>mx4j-tools</artifactId>
+                </exclusion>
+                
+                <exclusion>
+                    <groupId>mx4j</groupId>
+                    <artifactId>mx4j-jmx</artifactId>
+                </exclusion>
+                
+                <exclusion>
+                    <groupId>checkstyle</groupId>
+                    <artifactId>checkstyle</artifactId>
+                </exclusion>
+                
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+                
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                
+                <exclusion>
+                    <groupId>logkit</groupId>
+                    <artifactId>logkit</artifactId>
+                </exclusion>
+                
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>nlog4j</artifactId>
+                </exclusion>
+                
+                <exclusion>
+                    <groupId>backport-util-concurrent</groupId>
+                    <artifactId>backport-util-concurrent</artifactId>
+                </exclusion>
+                
+                <exclusion>
+                    <groupId>avalon-framework</groupId>
+                    <artifactId>avalon-framework</artifactId>
+                </exclusion>
+                
+                <exclusion>
+                    <groupId>xerces</groupId>
+                    <artifactId>xercesImpl</artifactId>
+                </exclusion>
+                
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+                
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+                </exclusion>
+                
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-jms_1.1_spec</artifactId>
+                </exclusion>
+                
+                <!--
+                FIXME: Do we need to exclude these?
+                -->
+                
+                <exclusion>
+                    <groupId>org.apache.activemq</groupId>
+                    <artifactId>activeio-core</artifactId>
+                </exclusion>
+                
+                <exclusion>
+                    <groupId>activesoap</groupId>
+                    <artifactId>jaxp-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
-
+        
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-ra</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+                </exclusion>
+                
+                <!--
+                FIXME: Do we need to exclude these?
+                -->
+                
+                <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring</artifactId>
+                </exclusion>
+                
+                <exclusion>
+                    <groupId>activemq</groupId>
+                    <artifactId>jmdns</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         
     </dependencies>

Modified: geronimo/server/branches/sachin/modules/geronimo-axis/src/main/java/org/apache/geronimo/axis/client/ServiceEndpointMethodInterceptor.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-axis/src/main/java/org/apache/geronimo/axis/client/ServiceEndpointMethodInterceptor.java?view=diff&rev=442980&r1=442979&r2=442980
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-axis/src/main/java/org/apache/geronimo/axis/client/ServiceEndpointMethodInterceptor.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-axis/src/main/java/org/apache/geronimo/axis/client/ServiceEndpointMethodInterceptor.java Wed Sep 13 06:19:32 2006
@@ -64,7 +64,7 @@
 
         stub.setUpCall(call);
         if (credentialsName != null) {
-            Subject subject = ContextManager.getCurrentCaller();
+            Subject subject = ContextManager.getNextCaller();
             if (subject == null) {
                 throw new IllegalStateException("Subject missing but authentication turned on");
             } else {

Modified: geronimo/server/branches/sachin/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/SubjectInterceptor.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/SubjectInterceptor.java?view=diff&rev=442980&r1=442979&r2=442980
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/SubjectInterceptor.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-connector/src/main/java/org/apache/geronimo/connector/outbound/SubjectInterceptor.java Wed Sep 13 06:19:32 2006
@@ -43,7 +43,7 @@
         Subject currentSubject = null;
         if (!connectionInfo.isApplicationManagedSecurity()) {
             try {
-                currentSubject = ContextManager.getCurrentCaller();
+                currentSubject = ContextManager.getNextCaller();
             } catch (SecurityException e) {
                 throw new ResourceException("Can not obtain Subject for login", e);
             }

Modified: geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/pom.xml?view=diff&rev=442980&r1=442979&r2=442980
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/pom.xml Wed Sep 13 06:19:32 2006
@@ -59,15 +59,15 @@
         NOTE: The full source for this artifact is private due to Sun licensing issues.
               To view the generated XmlBeans source please see the -src artifact in the repository:
               
-              http://people.apache.org/repo/m2-snapshot-repository/org/apache/geronimo/schema/geronimo-schema-j2ee1.4/
+              http://people.apache.org/repo/m2-snapshot-repository/org/apache/geronimo/schema/
               
               The full source is here with restricted access:
               
-              https://svn.apache.org/repos/tck/geronimo-tck/schema/j2ee14
+              https://svn.apache.org/repos/tck/geronimo-tck/schema/geronimo-schema-j2ee_1.4/trunk
         -->
         <dependency>
             <groupId>org.apache.geronimo.schema</groupId>
-            <artifactId>geronimo-schema-j2ee1.4</artifactId>
+            <artifactId>geronimo-schema-j2ee_1.4</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
         

Modified: geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/main/resources/META-INF/geronimo-dependency.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/main/resources/META-INF/geronimo-dependency.xml?view=diff&rev=442980&r1=442979&r2=442980
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/main/resources/META-INF/geronimo-dependency.xml (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/main/resources/META-INF/geronimo-dependency.xml Wed Sep 13 06:19:32 2006
@@ -20,7 +20,7 @@
 <dep:service xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
     <dep:dependency>
         <dep:groupId>org.apache.geronimo.schema</dep:groupId>
-        <dep:artifactId>geronimo-schema-j2ee1.4</dep:artifactId>
+        <dep:artifactId>geronimo-schema-j2ee_1.4</dep:artifactId>
         <dep:version>1.0-SNAPSHOT</dep:version>
     </dep:dependency>
 </dep:service>

Modified: geronimo/server/branches/sachin/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ContextManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ContextManager.java?view=diff&rev=442980&r1=442979&r2=442980
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ContextManager.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-security/src/main/java/org/apache/geronimo/security/ContextManager.java Wed Sep 13 06:19:32 2006
@@ -113,6 +113,7 @@
         if (sm != null) sm.checkPermission(SET_CONTEXT);
         assert nextCaller != null;
         Callers oldCallers = (Callers) callers.get();
+        assert oldCallers != null;
         Callers newCallers = new Callers(oldCallers.getNextCaller(), nextCaller);
         callers.set(newCallers);
         return oldCallers;
@@ -143,11 +144,21 @@
         return callers == null? null: callers.getCurrentCaller();
     }
 
+    public static Subject getNextCaller() {
+        SecurityManager sm = System.getSecurityManager();
+        if (sm != null) sm.checkPermission(GET_CONTEXT);
+
+        Callers callers = (Callers) ContextManager.callers.get();
+        return callers == null? null: callers.getNextCaller();
+    }
+
     public static AccessControlContext getCurrentContext() {
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) sm.checkPermission(GET_CONTEXT);
 
-        Subject currentSubject = ((Callers) callers.get()).getCurrentCaller();
+        Callers threadLocalCallers = (Callers) callers.get();
+        assert threadLocalCallers != null : "No current callers";
+        Subject currentSubject = threadLocalCallers.getCurrentCaller();
         assert currentSubject != null : "No current caller";
         Context context = (Context) subjectContexts.get(currentSubject);
 
@@ -178,7 +189,10 @@
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) sm.checkPermission(GET_CONTEXT);
 
-        Subject currentSubject = ((Callers) callers.get()).getCurrentCaller();
+        Callers threadLocalCallers = (Callers) callers.get();
+        assert threadLocalCallers != null : "No current callers";
+        Subject currentSubject = threadLocalCallers.getCurrentCaller();
+        assert currentSubject != null : "No current caller";
         Context context = (Context) subjectContexts.get(currentSubject);
 
         assert context != null : "No registered context";
@@ -200,8 +214,14 @@
         if (role == null) throw new IllegalArgumentException("Role must not be null");
 
         try {
-            Subject currentSubject = ((Callers) callers.get()).getCurrentCaller();
-            if (currentSubject == null) return false;
+            Callers currentCallers = (Callers)callers.get();
+            if (currentCallers == null) {
+                return false;
+            }
+            Subject currentSubject = currentCallers.getCurrentCaller();
+            if (currentSubject == null) {
+                return false;
+            }
 
             Context context = (Context) subjectContexts.get(currentSubject);
 

Modified: geronimo/server/branches/sachin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/pom.xml?view=diff&rev=442980&r1=442979&r2=442980
==============================================================================
--- geronimo/server/branches/sachin/pom.xml (original)
+++ geronimo/server/branches/sachin/pom.xml Wed Sep 13 06:19:32 2006
@@ -48,7 +48,7 @@
         <!--
         HACK: Used by uddi-db to execute the sql plugin with the Derby driver.
         -->
-        <derbyVersion>10.1.1.0</derbyVersion>
+        <derbyVersion>10.1.3.1</derbyVersion>
         
         <!--
         HACK: Used by jsp and servlet example configs to point to the tomcat deployer
@@ -258,7 +258,7 @@
             <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>
-                <version>1.2.8</version>
+                <version>1.2.13</version>
             </dependency>
 
             <dependency>

Modified: geronimo/server/branches/sachin/testsuite/console-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/testsuite/console-testsuite/pom.xml?view=diff&rev=442980&r1=442979&r2=442980
==============================================================================
--- geronimo/server/branches/sachin/testsuite/console-testsuite/pom.xml (original)
+++ geronimo/server/branches/sachin/testsuite/console-testsuite/pom.xml Wed Sep 13 06:19:32 2006
@@ -90,7 +90,7 @@
                                 <id>start-server</id>
                                 <phase>pre-integration-test</phase>
                                 <goals>
-                                    <goal>start</goal>
+                                    <goal>start-server</goal>
                                 </goals>
                                 <configuration>
                                     <background>true</background>
@@ -101,7 +101,7 @@
                                 <id>stop-server</id>
                                 <phase>post-integration-test</phase>
                                 <goals>
-                                    <goal>stop</goal>
+                                    <goal>stop-server</goal>
                                 </goals>
                             </execution>
                         </executions>

Modified: geronimo/server/branches/sachin/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/testsuite/pom.xml?view=diff&rev=442980&r1=442979&r2=442980
==============================================================================
--- geronimo/server/branches/sachin/testsuite/pom.xml (original)
+++ geronimo/server/branches/sachin/testsuite/pom.xml Wed Sep 13 06:19:32 2006
@@ -41,6 +41,7 @@
     </description>
     
     <modules>
+        <module>deployment-testsuite</module>
         <module>console-testsuite</module>
     </modules>
     

Modified: geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-ejb-j2ee_1.3/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-ejb-j2ee_1.3/src/main/resources/META-INF/openejb-jar.xml?view=diff&rev=442980&r1=442979&r2=442980
==============================================================================
--- geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-ejb-j2ee_1.3/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-ejb-j2ee_1.3/src/main/resources/META-INF/openejb-jar.xml Wed Sep 13 06:19:32 2006
@@ -22,23 +22,8 @@
 
 <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
 
-    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
-        <moduleId>
-            <groupId>org.apache.geronimo.test</groupId>
-            <artifactId>test-ejb-j2ee-1.3</artifactId>
-            <version>1.0</version>
-            <type>ejb</type>
-        </moduleId>
-        <dependencies>
-            <dependency>
-                <groupId>console.dbpool</groupId>
-                <artifactId>DefaultDatasource</artifactId>
-            </dependency>
-        </dependencies>
-    </environment>
-
     <cmp-connection-factory>
-        <resource-link>DefaultDatasource</resource-link>
+        <resource-link>SystemDatasource</resource-link>
     </cmp-connection-factory>
 
     <enterprise-beans>

Modified: geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/src/main/rar/META-INF/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/src/main/rar/META-INF/geronimo-ra.xml?view=diff&rev=442980&r1=442979&r2=442980
==============================================================================
--- geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/src/main/rar/META-INF/geronimo-ra.xml (original)
+++ geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-rar-j2ee_1.3/src/main/rar/META-INF/geronimo-ra.xml Wed Sep 13 06:19:32 2006
@@ -23,17 +23,10 @@
 <rar:connector xmlns:rar="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
     <sys:environment>
-        <sys:moduleId>
-            <sys:groupId>org.apache.geronimo.test-ear-j2ee-1_3</sys:groupId>
-            <sys:artifactId>test-rar-j2ee-1.3</sys:artifactId>
-            <sys:version>1.0</sys:version>
-            <sys:type>rar</sys:type>
-        </sys:moduleId>
         <sys:dependencies>
             <sys:dependency>
                 <sys:groupId>org.apache.derby</sys:groupId>
                 <sys:artifactId>derby</sys:artifactId>
-                <sys:version>10.1.1.0</sys:version>
                 <sys:type>jar</sys:type>
             </sys:dependency>
         </sys:dependencies>

Modified: geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=442980&r1=442979&r2=442980
==============================================================================
--- geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.3/test-war-j2ee_1.3/src/main/webapp/WEB-INF/geronimo-web.xml Wed Sep 13 06:19:32 2006
@@ -22,27 +22,14 @@
 
 <tomcat:web-app xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web-1.2" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
-    <sys:environment>
-        <sys:moduleId>
-            <sys:groupId>org.apache.geronimo.test</sys:groupId>
-            <sys:artifactId>test-war-j2ee-1.3</sys:artifactId>
-            <sys:version>1.0</sys:version>
-            <sys:type>war</sys:type>
-        </sys:moduleId>
-        <sys:dependencies>
-            <sys:dependency>
-                <sys:groupId>console.dbpool</sys:groupId>
-                <sys:artifactId>DefaultDatasource</sys:artifactId>
-            </sys:dependency>
-        </sys:dependencies>
-    </sys:environment>
     <naming:resource-ref>
         <naming:ref-name>ejb/SimpleStatelessSession</naming:ref-name>
         <naming:resource-link>SimpleStatelessSession</naming:resource-link>
     </naming:resource-ref>
+    
     <naming:resource-ref>
         <naming:ref-name>ds/DataSourceName</naming:ref-name>
-        <naming:resource-link>DefaultDatasource</naming:resource-link>
+        <naming:resource-link>SystemDatasource</naming:resource-link>
     </naming:resource-ref>
 
 </tomcat:web-app>

Modified: geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/src/main/resources/META-INF/openejb-jar.xml?view=diff&rev=442980&r1=442979&r2=442980
==============================================================================
--- geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-ejb-j2ee_1.4/src/main/resources/META-INF/openejb-jar.xml Wed Sep 13 06:19:32 2006
@@ -22,23 +22,8 @@
 
 <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
 
-    <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-        <moduleId>
-            <groupId>org.apache.geronimo.test</groupId>
-            <artifactId>test-ejb-j2ee-1.4</artifactId>
-            <version>1.0</version>
-            <type>ejb</type>
-        </moduleId>
-        <dependencies>
-            <dependency>
-                <groupId>console.dbpool</groupId>
-                <artifactId>DefaultDatasource</artifactId>
-            </dependency>
-        </dependencies>
-    </environment>
-
     <cmp-connection-factory>
-        <resource-link>DefaultDatasource</resource-link>
+        <resource-link>SystemDatasource</resource-link>
     </cmp-connection-factory>
 
     <enterprise-beans>

Modified: geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/src/main/rar/META-INF/geronimo-ra.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/src/main/rar/META-INF/geronimo-ra.xml?view=diff&rev=442980&r1=442979&r2=442980
==============================================================================
--- geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/src/main/rar/META-INF/geronimo-ra.xml (original)
+++ geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-rar-j2ee_1.4/src/main/rar/META-INF/geronimo-ra.xml Wed Sep 13 06:19:32 2006
@@ -23,17 +23,10 @@
 <rar:connector xmlns:rar="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
     <sys:environment>
-        <sys:moduleId>
-            <sys:groupId>org.apache.geronimo.test-ear-j2ee-1_4</sys:groupId>
-            <sys:artifactId>test-rar-j2ee-1.4</sys:artifactId>
-            <sys:version>1.0</sys:version>
-            <sys:type>rar</sys:type>
-        </sys:moduleId>
         <sys:dependencies>
             <sys:dependency>
                 <sys:groupId>org.apache.derby</sys:groupId>
                 <sys:artifactId>derby</sys:artifactId>
-                <sys:version>10.1.1.0</sys:version>
                 <sys:type>jar</sys:type>
             </sys:dependency>
         </sys:dependencies>

Modified: geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=442980&r1=442979&r2=442980
==============================================================================
--- geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/branches/sachin/testsupport/test-deployment-j2ee_1.4/test-war-j2ee_1.4/src/main/webapp/WEB-INF/geronimo-web.xml Wed Sep 13 06:19:32 2006
@@ -22,27 +22,14 @@
 
 <tomcat:web-app xmlns:tomcat="http://geronimo.apache.org/xml/ns/j2ee/web-1.2" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
-    <sys:environment>
-        <sys:moduleId>
-            <sys:groupId>org.apache.geronimo.test</sys:groupId>
-            <sys:artifactId>test-war-j2ee-1.4</sys:artifactId>
-            <sys:version>1.0</sys:version>
-            <sys:type>war</sys:type>
-        </sys:moduleId>
-        <sys:dependencies>
-            <sys:dependency>
-                <sys:groupId>console.dbpool</sys:groupId>
-                <sys:artifactId>DefaultDatasource</sys:artifactId>
-            </sys:dependency>
-        </sys:dependencies>
-    </sys:environment>
     <naming:resource-ref>
         <naming:ref-name>ejb/SimpleStatelessSession</naming:ref-name>
         <naming:resource-link>SimpleStatelessSession</naming:resource-link>
     </naming:resource-ref>
+    
     <naming:resource-ref>
         <naming:ref-name>ds/DataSourceName</naming:ref-name>
-        <naming:resource-link>DefaultDatasource</naming:resource-link>
+        <naming:resource-link>SystemDatasource</naming:resource-link>
     </naming:resource-ref>
 
 </tomcat:web-app>



Mime
View raw message