geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1134496 - in /geronimo/server/trunk: framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/ framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/ framework/configs/jsr88-deploymentfactory/ framework/configs/online-de...
Date Sat, 11 Jun 2011 01:05:35 GMT
Author: xuhaihong
Date: Sat Jun 11 01:05:34 2011
New Revision: 1134496

URL: http://svn.apache.org/viewvc?rev=1134496&view=rev
Log:
Comment out those classpath configurations, will remove some of them after double checking

Modified:
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
    geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
    geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
    geronimo/server/trunk/framework/configs/online-deployer/pom.xml
    geronimo/server/trunk/framework/configs/shutdown/pom.xml
    geronimo/server/trunk/plugins/cxf/cxf-jaxws-tools/pom.xml

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml?rev=1134496&r1=1134495&r2=1134496&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it1/pom.xml
Sat Jun 11 01:05:34 2011
@@ -184,7 +184,7 @@
                     <!--
                     NOTE: This list of dependencies is non-transitive.
                     -->
-                    <classpath>
+                    <!--classpath>
                         <element>
                             <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>geronimo-cli</artifactId>
@@ -194,11 +194,11 @@
                             <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>geronimo-kernel</artifactId>
                             <version>${project.version}</version>
-                        </element>
+                        </element-->
                         <!--
                         NOTE: geronimo-transformer needs to be on the system classpath to
avoid a potential deadlock. See GERONIMO-3141.
                         -->
-                        <element>
+                        <!--element>
                             <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>geronimo-transformer</artifactId>
                             <version>${project.version}</version>
@@ -227,7 +227,6 @@
                             <groupId>com.thoughtworks.xstream</groupId>
                             <artifactId>xstream</artifactId>
                         </element>
-                        <!-- TODO bad idea... temp, for plugins -->
                         <element>
                             <groupId>org.apache.geronimo.specs</groupId>
                             <artifactId>geronimo-jaxb_2.2_spec</artifactId>
@@ -249,7 +248,7 @@
                             <artifactId>geronimo-activation_1.1_spec</artifactId>
                         </element>
                     </classpath>
-                    <classpathPrefix>../lib</classpathPrefix>
+                    <classpathPrefix>../lib</classpathPrefix-->
 
                     <category>Geronimo Core</category>
                     <osiApproved>true</osiApproved>

Modified: geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml?rev=1134496&r1=1134495&r2=1134496&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
(original)
+++ geronimo/server/trunk/framework/configs/geronimo-gbean-deployer/src/it/j2ee-system-it2/pom.xml
Sat Jun 11 01:05:34 2011
@@ -184,7 +184,7 @@
                     <!--
                     NOTE: This list of dependencies is non-transitive.
                     -->
-                    <classpath>
+                    <!--classpath>
                         <element>
                             <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>geronimo-cli</artifactId>
@@ -194,11 +194,11 @@
                             <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>geronimo-kernel</artifactId>
                             <version>${project.version}</version>
-                        </element>
+                        </element-->
                         <!--
                         NOTE: geronimo-transformer needs to be on the system classpath to
avoid a potential deadlock. See GERONIMO-3141.
                         -->
-                        <element>
+                        <!--element>
                             <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>geronimo-transformer</artifactId>
                             <version>${project.version}</version>
@@ -230,9 +230,9 @@
                         <element>
                             <groupId>com.thoughtworks.xstream</groupId>
                             <artifactId>xstream</artifactId>
-                        </element>
+                        </element-->
                         <!-- TODO bad idea... temp, for plugins -->
-                        <element>
+                        <!--element>
                             <groupId>org.apache.geronimo.specs</groupId>
                             <artifactId>geronimo-jaxb_2.2_spec</artifactId>
                         </element>
@@ -253,7 +253,7 @@
                             <artifactId>geronimo-activation_1.1_spec</artifactId>
                         </element>
                     </classpath>
-                    <classpathPrefix>../lib</classpathPrefix>
+                    <classpathPrefix>../lib</classpathPrefix-->
                     <category>Geronimo Core</category>
                     <config-xml-content load="false" />
                 </configuration>

Modified: geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml?rev=1134496&r1=1134495&r2=1134496&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml Sat Jun 11 01:05:34
2011
@@ -128,7 +128,7 @@
                     <!--
                     NOTE: This list of dependencies is non-transitive.
                     -->
-                    <classpath>
+                    <!--classpath>
                         <element>
                             <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>geronimo-crypto</artifactId>
@@ -165,7 +165,7 @@
                             <artifactId>xstream</artifactId>
                         </element>
                     </classpath>
-                    <classpathPrefix>../lib</classpathPrefix>
+                    <classpathPrefix>../lib</classpathPrefix-->
 
                     <category>Deployment</category>
                     <instance>

Modified: geronimo/server/trunk/framework/configs/online-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/online-deployer/pom.xml?rev=1134496&r1=1134495&r2=1134496&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/online-deployer/pom.xml Sat Jun 11 01:05:34 2011
@@ -129,7 +129,7 @@
                     <!--
                     NOTE: This list of dependencies is non-transitive.
                     -->
-                    <classpath>
+                    <!--classpath>
                         <element>
                             <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>geronimo-cli</artifactId>
@@ -170,7 +170,7 @@
                             <artifactId>xstream</artifactId>
                         </element>
                     </classpath>
-                    <classpathPrefix>../lib</classpathPrefix>
+                    <classpathPrefix>../lib</classpathPrefix-->
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/trunk/framework/configs/shutdown/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/shutdown/pom.xml?rev=1134496&r1=1134495&r2=1134496&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/shutdown/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/shutdown/pom.xml Sat Jun 11 01:05:34 2011
@@ -87,31 +87,6 @@
                             <mainClass>org.apache.geronimo.kernel.util.MainBootstrapper</mainClass>
                         </manifest>
                     </archive>
-
-                    <!--
-                    NOTE: This list of dependencies is non-transitive.
-                    -->
-                    <classpath>
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-crypto</artifactId>
-                            <version>${project.version}</version>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-kernel</artifactId>
-                            <version>${project.version}</version>
-                        </element>
-                        <element>
-                            <groupId>cglib</groupId>
-                            <artifactId>cglib-nodep</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.apache.xbean</groupId>
-                            <artifactId>xbean-reflect</artifactId>
-                        </element>
-                    </classpath>
-                    <classpathPrefix>../lib</classpathPrefix>
                     <category>Geronimo Core</category>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/trunk/plugins/cxf/cxf-jaxws-tools/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-jaxws-tools/pom.xml?rev=1134496&r1=1134495&r2=1134496&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-jaxws-tools/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-jaxws-tools/pom.xml Sat Jun 11 01:05:34 2011
@@ -95,7 +95,7 @@
                     <!--
                     NOTE: This list of dependencies is non-transitive.
                     -->
-                    <classpath>
+                    <!--classpath>
                         <element>
                             <groupId>org.apache.geronimo.framework</groupId>
                             <artifactId>geronimo-kernel</artifactId>
@@ -141,7 +141,7 @@
                             <artifactId>log4j</artifactId>
                         </element>
                     </classpath>
-                    <classpathPrefix>../lib</classpathPrefix>
+                    <classpathPrefix>../lib</classpathPrefix-->
 
                     <useMavenDependencies>
                         <value>true</value>



Mime
View raw message