geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1135029 - in /geronimo/server/trunk/framework/configs: client-system/ geronimo-gbean-deployer/src/it/j2ee-system-it1/ geronimo-gbean-deployer/src/it/j2ee-system-it2/ j2ee-system/ jsr88-deploymentfactory/ karaf-framework/src/main/history/ o...
Date Mon, 13 Jun 2011 06:05:05 GMT
Author: xuhaihong
Date: Mon Jun 13 06:05:04 2011
New Revision: 1135029

URL: http://svn.apache.org/viewvc?rev=1135029&view=rev
Log:
GERONIMO-6003 Remove unnecessary classpath configurations, since now Geronimo directly keeps
the entry point class in the script files

Modified:
    geronimo/server/trunk/framework/configs/client-system/pom.xml
    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/j2ee-system/pom.xml
    geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
    geronimo/server/trunk/framework/configs/online-deployer/pom.xml
    geronimo/server/trunk/framework/configs/shutdown/pom.xml

Modified: geronimo/server/trunk/framework/configs/client-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/client-system/pom.xml?rev=1135029&r1=1135028&r2=1135029&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/client-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/client-system/pom.xml Mon Jun 13 06:05:04 2011
@@ -133,86 +133,6 @@
                     </deploymentConfigs>
                     <deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
                     <boot>true</boot>
-                    <!--
-                    <archive>
-                        <manifestEntries>
-                            <Endorsed-Dirs>lib/endorsed</Endorsed-Dirs>
-                            <Extension-Dirs>lib/ext</Extension-Dirs>
-                        </manifestEntries>
-                        <manifest>
-                            <mainClass>org.apache.geronimo.cli.client.ClientCLI</mainClass>
-                        </manifest>
-                    </archive>
-                    -->
-                    <!--
-                    NOTE: This list of dependencies is non-transitive.
-                    -->
-                    <!--<classpath>-->
-                        <!--<element>-->
-                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-                            <!--<artifactId>geronimo-cli</artifactId>-->
-                            <!--<version>${project.version}</version>-->
-                        <!--</element>-->
-                        <!--<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>-->
-                        <!--&lt;!&ndash;-->
-                        <!--NOTE: geronimo-transformer is on the system classpath to avoid
a potential deadlock. See GERONIMO-3141.-->
-                        <!--&ndash;&gt;-->
-                        <!--&lt;!&ndash;<element>&ndash;&gt;-->
-                            <!--&lt;!&ndash;<groupId>org.apache.geronimo.framework</groupId>&ndash;&gt;-->
-                            <!--&lt;!&ndash;<artifactId>geronimo-transformer</artifactId>&ndash;&gt;-->
-                            <!--&lt;!&ndash;<version>${project.version}</version>&ndash;&gt;-->
-                        <!--&lt;!&ndash;</element>&ndash;&gt;-->
-                        <!--<element>-->
-                            <!--<groupId>asm</groupId>-->
-                            <!--<artifactId>asm-all</artifactId>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>commons-cli</groupId>-->
-                            <!--<artifactId>commons-cli</artifactId>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>cglib</groupId>-->
-                            <!--<artifactId>cglib-nodep</artifactId>-->
-                        <!--</element>-->
-                        <!--&lt;!&ndash;<element>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<groupId>org.slf4j</groupId>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<artifactId>slf4j-api</artifactId>&ndash;&gt;-->
-                        <!--&lt;!&ndash;</element>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<element>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<groupId>org.slf4j</groupId>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<artifactId>slf4j-log4j12</artifactId>&ndash;&gt;-->
-                        <!--&lt;!&ndash;</element>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<element>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<groupId>org.slf4j</groupId>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<artifactId>jcl-over-slf4j</artifactId>&ndash;&gt;-->
-                        <!--&lt;!&ndash;</element>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<element>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<groupId>log4j</groupId>&ndash;&gt;-->
-                        <!--&lt;!&ndash;<artifactId>log4j</artifactId>&ndash;&gt;-->
-                        <!--&lt;!&ndash;</element>&ndash;&gt;-->
-                        <!--<element>-->
-                            <!--<groupId>xpp3</groupId>-->
-                            <!--<artifactId>xpp3_min</artifactId>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>org.apache.xbean</groupId>-->
-                            <!--<artifactId>xbean-reflect</artifactId>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>com.thoughtworks.xstream</groupId>-->
-                            <!--<artifactId>xstream</artifactId>-->
-                        <!--</element>-->
-                    <!--</classpath>-->
-                    <!--<classpathPrefix>../lib</classpathPrefix>-->
 
                     <category>Geronimo Core</category>
                     <instance>

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=1135029&r1=1135028&r2=1135029&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
Mon Jun 13 06:05:04 2011
@@ -171,85 +171,6 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Endorsed-Dirs>lib/endorsed</Endorsed-Dirs>
-                            <Extension-Dirs>lib/ext</Extension-Dirs>
-                        </manifestEntries>
-                        <manifest>
-                            <mainClass>org.apache.geronimo.cli.daemon.DaemonCLI</mainClass>
-                        </manifest>
-                    </archive>
-
-                    <!--
-                    NOTE: This list of dependencies is non-transitive.
-                    -->
-                    <!--classpath>
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-cli</artifactId>
-                            <version>${project.version}</version>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-kernel</artifactId>
-                            <version>${project.version}</version>
-                        </element-->
-                        <!--
-                        NOTE: geronimo-transformer needs to be on the system classpath to
avoid a potential deadlock. See GERONIMO-3141.
-                        -->
-                        <!--element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-transformer</artifactId>
-                            <version>${project.version}</version>
-                        </element>
-                        <element>
-                            <groupId>asm</groupId>
-                            <artifactId>asm</artifactId>
-                        </element>
-                        <element>
-                            <groupId>asm</groupId>
-                            <artifactId>asm-commons</artifactId>
-                        </element>
-                        <element>
-                            <groupId>commons-cli</groupId>
-                            <artifactId>commons-cli</artifactId>
-                        </element>
-                        <element>
-                            <groupId>cglib</groupId>
-                            <artifactId>cglib-nodep</artifactId>
-                        </element>
-                        <element>
-                            <groupId>xpp3</groupId>
-                            <artifactId>xpp3_min</artifactId>
-                        </element>
-                        <element>
-                            <groupId>com.thoughtworks.xstream</groupId>
-                            <artifactId>xstream</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.specs</groupId>
-                            <artifactId>geronimo-jaxb_2.2_spec</artifactId>
-                        </element>
-                        <element>
-                            <groupId>com.sun.xml.bind</groupId>
-                            <artifactId>jaxb-impl</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.specs</groupId>
-                            <artifactId>geronimo-stax-api_1.2_spec</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.codehaus.woodstox</groupId>
-                            <artifactId>wstx-asl</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.specs</groupId>
-                            <artifactId>geronimo-activation_1.1_spec</artifactId>
-                        </element>
-                    </classpath>
-                    <classpathPrefix>../lib</classpathPrefix-->
-
                     <category>Geronimo Core</category>
                     <osiApproved>true</osiApproved>
                     <geronimoVersion>${project.version}</geronimoVersion>

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=1135029&r1=1135028&r2=1135029&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
Mon Jun 13 06:05:04 2011
@@ -171,89 +171,6 @@
                 <groupId>org.apache.geronimo.buildsupport</groupId>
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
-                    <archive>
-                        <manifestEntries>
-                            <Endorsed-Dirs>lib/endorsed</Endorsed-Dirs>
-                            <Extension-Dirs>lib/ext</Extension-Dirs>
-                        </manifestEntries>
-                        <manifest>
-                            <mainClass>org.apache.geronimo.cli.daemon.DaemonCLI</mainClass>
-                        </manifest>
-                    </archive>
-
-                    <!--
-                    NOTE: This list of dependencies is non-transitive.
-                    -->
-                    <!--classpath>
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-cli</artifactId>
-                            <version>${project.version}</version>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-kernel</artifactId>
-                            <version>${project.version}</version>
-                        </element-->
-                        <!--
-                        NOTE: geronimo-transformer needs to be on the system classpath to
avoid a potential deadlock. See GERONIMO-3141.
-                        -->
-                        <!--element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-transformer</artifactId>
-                            <version>${project.version}</version>
-                        </element>
-                        <element>
-                            <groupId>asm</groupId>
-                            <artifactId>asm</artifactId>
-                        </element>
-                        <element>
-                            <groupId>asm</groupId>
-                            <artifactId>asm-commons</artifactId>
-                        </element>
-                        <element>
-                            <groupId>commons-cli</groupId>
-                            <artifactId>commons-cli</artifactId>
-                        </element>
-                        <element>
-                            <groupId>cglib</groupId>
-                            <artifactId>cglib-nodep</artifactId>
-                        </element>
-                        <element>
-                            <groupId>log4j</groupId>
-                            <artifactId>log4j</artifactId>
-                        </element>
-                        <element>
-                            <groupId>xpp3</groupId>
-                            <artifactId>xpp3_min</artifactId>
-                        </element>
-                        <element>
-                            <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>
-                        </element>
-                        <element>
-                            <groupId>com.sun.xml.bind</groupId>
-                            <artifactId>jaxb-impl</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.specs</groupId>
-                            <artifactId>geronimo-stax-api_1.2_spec</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.codehaus.woodstox</groupId>
-                            <artifactId>wstx-asl</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.apache.geronimo.specs</groupId>
-                            <artifactId>geronimo-activation_1.1_spec</artifactId>
-                        </element>
-                    </classpath>
-                    <classpathPrefix>../lib</classpathPrefix-->
                     <category>Geronimo Core</category>
                     <config-xml-content load="false" />
                 </configuration>

Modified: geronimo/server/trunk/framework/configs/j2ee-system/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-system/pom.xml?rev=1135029&r1=1135028&r2=1135029&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-system/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-system/pom.xml Mon Jun 13 06:05:04 2011
@@ -178,78 +178,6 @@
                     </deploymentConfigs>
                     <deployerName>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer</deployerName>
                     <boot>true</boot>
-                    <!--<archive>-->
-                        <!--<manifestEntries>-->
-                            <!--<Endorsed-Dirs>lib/endorsed</Endorsed-Dirs>-->
-                            <!--<Extension-Dirs>lib/ext</Extension-Dirs>-->
-                        <!--</manifestEntries>-->
-                        <!--<manifest>-->
-                            <!--<mainClass>org.apache.geronimo.cli.daemon.DaemonCLI</mainClass>-->
-                        <!--</manifest>-->
-                    <!--</archive>-->
-
-                    <!--
-                    NOTE: This list of dependencies is non-transitive.
-                    -->
-                    <!--<classpath>-->
-                        <!--<element>-->
-                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-                            <!--<artifactId>geronimo-cli</artifactId>-->
-                            <!--<version>${project.version}</version>-->
-                        <!--</element>-->
-                        <!--<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>org.apache.geronimo.framework</groupId>-->
-                            <!--<artifactId>geronimo-config-groovy-transformer</artifactId>-->
-                            <!--<version>${project.version}</version>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>org.codehaus.groovy</groupId>-->
-                            <!--<artifactId>groovy-all-minimal</artifactId>-->
-                        <!--</element>-->
-                        <!--&lt;!&ndash;-->
-                        <!--NOTE: geronimo-transformer needs to be on the system classpath
to avoid a potential deadlock. See GERONIMO-3141.-->
-                        <!--&ndash;&gt;-->
-                        <!--<element>-->
-                            <!--<groupId>org.apache.geronimo.framework</groupId>-->
-                            <!--<artifactId>geronimo-transformer</artifactId>-->
-                            <!--<version>${project.version}</version>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>asm</groupId>-->
-                            <!--<artifactId>asm-all</artifactId>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>commons-cli</groupId>-->
-                            <!--<artifactId>commons-cli</artifactId>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>cglib</groupId>-->
-                            <!--<artifactId>cglib-nodep</artifactId>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>xpp3</groupId>-->
-                            <!--<artifactId>xpp3_min</artifactId>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>org.apache.xbean</groupId>-->
-                            <!--<artifactId>xbean-reflect</artifactId>-->
-                        <!--</element>-->
-                        <!--<element>-->
-                            <!--<groupId>com.thoughtworks.xstream</groupId>-->
-                            <!--<artifactId>xstream</artifactId>-->
-                        <!--</element>-->
-                    <!--</classpath>-->
-                    <!--<classpathPrefix>../lib</classpathPrefix>-->
 
                     <category>Geronimo Core</category>
                     <config-xml-content load="false" />

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=1135029&r1=1135028&r2=1135029&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/jsr88-deploymentfactory/pom.xml Mon Jun 13 06:05:04
2011
@@ -125,48 +125,6 @@
                         </manifestEntries>
                     </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>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-deploy-jsr88-bootstrapper</artifactId>
-                            <version>${project.version}</version>
-                        </element>
-                        <element>
-                            <groupId>asm</groupId>
-                            <artifactId>asm-all</artifactId>
-                        </element>
-                        <element>
-                            <groupId>cglib</groupId>
-                            <artifactId>cglib-nodep</artifactId>
-                        </element>
-                        <element>
-                            <groupId>xpp3</groupId>
-                            <artifactId>xpp3_min</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.apache.xbean</groupId>
-                            <artifactId>xbean-reflect</artifactId>
-                        </element>
-                        <element>
-                            <groupId>com.thoughtworks.xstream</groupId>
-                            <artifactId>xstream</artifactId>
-                        </element>
-                    </classpath>
-                    <classpathPrefix>../lib</classpathPrefix-->
-
                     <category>Deployment</category>
                     <instance>
                         <plugin-artifact>

Modified: geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml?rev=1135029&r1=1135028&r2=1135029&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/framework/configs/karaf-framework/src/main/history/dependencies.xml
Mon Jun 13 06:05:04 2011
@@ -396,9 +396,4 @@
         <artifactId>org.osgi.core</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-api</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

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=1135029&r1=1135028&r2=1135029&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/online-deployer/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/online-deployer/pom.xml Mon Jun 13 06:05:04 2011
@@ -116,61 +116,6 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <boot>true</boot>
-                    <archive>
-                        <manifestEntries>
-                            <Endorsed-Dirs>lib/endorsed</Endorsed-Dirs>
-                            <Extension-Dirs>lib/ext</Extension-Dirs>
-                        </manifestEntries>
-                        <manifest>
-                            <mainClass>org.apache.geronimo.cli.deployer.DeployerCLI</mainClass>
-                        </manifest>
-                    </archive>
-
-                    <!--
-                    NOTE: This list of dependencies is non-transitive.
-                    -->
-                    <!--classpath>
-                        <element>
-                            <groupId>org.apache.geronimo.framework</groupId>
-                            <artifactId>geronimo-cli</artifactId>
-                            <version>${project.version}</version>
-                        </element>
-                        <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>commons-cli</groupId>
-                            <artifactId>commons-cli</artifactId>
-                        </element>
-                        <element>
-                            <groupId>asm</groupId>
-                            <artifactId>asm-all</artifactId>
-                        </element>
-                        <element>
-                            <groupId>cglib</groupId>
-                            <artifactId>cglib-nodep</artifactId>
-                        </element>
-                        <element>
-                            <groupId>xpp3</groupId>
-                            <artifactId>xpp3_min</artifactId>
-                        </element>
-                        <element>
-                            <groupId>org.apache.xbean</groupId>
-                            <artifactId>xbean-reflect</artifactId>
-                        </element>
-                        <element>
-                            <groupId>com.thoughtworks.xstream</groupId>
-                            <artifactId>xstream</artifactId>
-                        </element>
-                    </classpath>
-                    <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=1135029&r1=1135028&r2=1135029&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/shutdown/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/shutdown/pom.xml Mon Jun 13 06:05:04 2011
@@ -78,15 +78,6 @@
                 <artifactId>car-maven-plugin</artifactId>
                 <configuration>
                     <boot>true</boot>
-                    <archive>
-                        <manifestEntries>
-                            <Endorsed-Dirs>lib/endorsed</Endorsed-Dirs>
-                            <Extension-Dirs>lib/ext</Extension-Dirs>
-                        </manifestEntries>
-                        <manifest>
-                            <mainClass>org.apache.geronimo.kernel.util.MainBootstrapper</mainClass>
-                        </manifest>
-                    </archive>
                     <category>Geronimo Core</category>
                     <instance>
                         <plugin-artifact>



Mime
View raw message