geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r395697 - in /geronimo/branches/1.1: applications/console-ear/ applications/console-ear/src/application/META-INF/ applications/daytrader/ applications/daytrader/ear/ applications/daytrader/ear/src/application/META-INF/ applications/daytrade...
Date Thu, 20 Apr 2006 21:07:49 GMT
Author: dain
Date: Thu Apr 20 14:07:47 2006
New Revision: 395697

URL: http://svn.apache.org/viewcvs?rev=395697&view=rev
Log:
Applied patch GERONIMO-1790 to shorten the paths of ear files.  Thanks Joe Bohn.

Modified:
    geronimo/branches/1.1/applications/console-ear/project.xml
    geronimo/branches/1.1/applications/console-ear/src/application/META-INF/application.xml
    geronimo/branches/1.1/applications/daytrader/dayTrader-plan.xml
    geronimo/branches/1.1/applications/daytrader/ear/project.xml
    geronimo/branches/1.1/applications/daytrader/ear/src/application/META-INF/application.xml
    geronimo/branches/1.1/applications/daytrader/streamer/project.xml
    geronimo/branches/1.1/applications/daytrader/streamer/src/client/META-INF/MANIFEST.MF
    geronimo/branches/1.1/applications/daytrader/web/src/webapp/WEB-INF/web.xml
    geronimo/branches/1.1/applications/daytrader/wsappclient/src/client/META-INF/MANIFEST.MF
    geronimo/branches/1.1/configs/console-jetty/src/plan/plan.xml
    geronimo/branches/1.1/configs/console-tomcat/src/plan/plan.xml
    geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml
    geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java

Modified: geronimo/branches/1.1/applications/console-ear/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-ear/project.xml?rev=395697&r1=395696&r2=395697&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-ear/project.xml (original)
+++ geronimo/branches/1.1/applications/console-ear/project.xml Thu Apr 20 14:07:47 2006
@@ -14,6 +14,7 @@
             <type>war</type>
             <properties>
                 <ear.bundle>true</ear.bundle>
+                <ear.bundle.name>framework.war</ear.bundle.name>
                 <ear.appxml.war.context-root>/console</ear.appxml.war.context-root>
             </properties>
         </dependency>
@@ -24,6 +25,7 @@
             <type>war</type>
             <properties>
                 <ear.bundle>true</ear.bundle>
+                <ear.bundle.name>standard.war</ear.bundle.name>
                 <ear.appxml.war.context-root>/console-standard</ear.appxml.war.context-root>
             </properties>
         </dependency>

Modified: geronimo/branches/1.1/applications/console-ear/src/application/META-INF/application.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-ear/src/application/META-INF/application.xml?rev=395697&r1=395696&r2=395697&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-ear/src/application/META-INF/application.xml
(original)
+++ geronimo/branches/1.1/applications/console-ear/src/application/META-INF/application.xml
Thu Apr 20 14:07:47 2006
@@ -6,13 +6,13 @@
     <display-name>Geronimo Console Application</display-name>
     <module>
         <web>
-            <web-uri>geronimo-console-framework-${pom.currentVersion}.war</web-uri>
+            <web-uri>framework.war</web-uri>
             <context-root>/console</context-root>
         </web>
     </module>
     <module>
         <web>
-            <web-uri>geronimo-console-standard-${pom.currentVersion}.war</web-uri>
+            <web-uri>standard.war</web-uri>
             <context-root>/console-standard</context-root>
         </web>
     </module>

Modified: geronimo/branches/1.1/applications/daytrader/dayTrader-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/daytrader/dayTrader-plan.xml?rev=395697&r1=395696&r2=395697&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/daytrader/dayTrader-plan.xml (original)
+++ geronimo/branches/1.1/applications/daytrader/dayTrader-plan.xml Thu Apr 20 14:07:47 2006
@@ -3,7 +3,7 @@
     configId="Trade">
 
     <module>
-        <web>daytrader-web-1.1-SNAPSHOT.war</web>
+        <web>web.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/web"
             configId="Web" parentId="Trade">
             <context-priority-classloader>false</context-priority-classloader>
@@ -30,7 +30,7 @@
     ##
     -->
     <module>
-        <ejb>daytrader-ejb-1.1-SNAPSHOT.jar</ejb>     <!--  Note this must
match the -->
+        <ejb>dt-ejb.jar</ejb>     <!--  Note this must match the -->
         <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar"
                      configId="TradeEJBs"
                      parentId="Web">
@@ -513,7 +513,7 @@
 
 
     <module>
-        <java>daytrader-streamer-1.1-SNAPSHOT.jar</java>
+        <java>streamer.jar</java>
         <application-client  xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client"
             configId="foo"
             clientConfigId="tradeStreamerAppclient">

Modified: geronimo/branches/1.1/applications/daytrader/ear/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/daytrader/ear/project.xml?rev=395697&r1=395696&r2=395697&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/daytrader/ear/project.xml (original)
+++ geronimo/branches/1.1/applications/daytrader/ear/project.xml Thu Apr 20 14:07:47 2006
@@ -24,6 +24,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <ear.bundle>true</ear.bundle>
+                <ear.bundle.name>core.jar</ear.bundle.name>
             </properties>
         </dependency>
         <dependency>
@@ -32,6 +33,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <ear.bundle>true</ear.bundle>
+                <ear.bundle.name>wsappclient.jar</ear.bundle.name>
             </properties>
         </dependency>
         <dependency>
@@ -41,6 +43,7 @@
             <type>war</type>
             <properties>
                 <ear.bundle>true</ear.bundle>
+                <ear.bundle.name>web.war</ear.bundle.name>
                 <ear.appxml.war.context-root>/daytrader</ear.appxml.war.context-root>
             </properties>
         </dependency>
@@ -51,7 +54,8 @@
             <type>ejb</type>
             <properties>
                 <ear.bundle>true</ear.bundle>
-            </properties>
+                <ear.bundle.name>dt-ejb.jar</ear.bundle.name>
+             </properties>
         </dependency>
         <dependency>
             <groupId>geronimo</groupId>
@@ -59,6 +63,7 @@
             <version>${pom.currentVersion}</version>
             <properties>
                 <ear.bundle>true</ear.bundle>
+                <ear.bundle.name>streamer.jar</ear.bundle.name>
             </properties>
         </dependency>
 

Modified: geronimo/branches/1.1/applications/daytrader/ear/src/application/META-INF/application.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/daytrader/ear/src/application/META-INF/application.xml?rev=395697&r1=395696&r2=395697&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/daytrader/ear/src/application/META-INF/application.xml
(original)
+++ geronimo/branches/1.1/applications/daytrader/ear/src/application/META-INF/application.xml
Thu Apr 20 14:07:47 2006
@@ -5,18 +5,18 @@
       <description>DayTrader Stock Trading Performance Benchmark Sample</description>
       <display-name>Trade</display-name>
       <module>
-         <java>daytrader-streamer-${daytrader_version}.jar</java>
+         <java>streamer.jar</java>
       </module>
       <module>
-         <java>daytrader-wsappclient-${daytrader_version}.jar</java>
+         <java>wsappclient.jar</java>
       </module>
       <module>
          <web>
-            <web-uri>daytrader-web-${daytrader_version}.war</web-uri>
+            <web-uri>web.war</web-uri>
             <context-root>/daytrader</context-root>
          </web>
       </module>
       <module>
-         <ejb>daytrader-ejb-${daytrader_version}.jar</ejb>
+         <ejb>dt-ejb.jar</ejb>
       </module>
 </application>

Modified: geronimo/branches/1.1/applications/daytrader/streamer/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/daytrader/streamer/project.xml?rev=395697&r1=395696&r2=395697&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/daytrader/streamer/project.xml (original)
+++ geronimo/branches/1.1/applications/daytrader/streamer/project.xml Thu Apr 20 14:07:47
2006
@@ -17,7 +17,7 @@
       <groupId>geronimo</groupId>
       <artifactId>daytrader-ejb</artifactId>
       <version>${pom.currentVersion}</version>
-     <type>ejb</type>
+      <type>ejb</type>
     </dependency>
     
      <dependency>

Modified: geronimo/branches/1.1/applications/daytrader/streamer/src/client/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/daytrader/streamer/src/client/META-INF/MANIFEST.MF?rev=395697&r1=395696&r2=395697&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/daytrader/streamer/src/client/META-INF/MANIFEST.MF
(original)
+++ geronimo/branches/1.1/applications/daytrader/streamer/src/client/META-INF/MANIFEST.MF
Thu Apr 20 14:07:47 2006
@@ -1,6 +1,4 @@
 Manifest-Version: 1.0
-Class-Path:  daytrader-ejb-${daytrader_version}.jar
-Created-By: 1.4.2_08 (Sun Microsystems Inc.)
-Ant-Version: Apache Ant 1.5.4 
+Class-Path:  dt-ejb.jar
 Main-Class: org.apache.geronimo.samples.daytrader.client.TradeClient
 

Modified: geronimo/branches/1.1/applications/daytrader/web/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/daytrader/web/src/webapp/WEB-INF/web.xml?rev=395697&r1=395696&r2=395697&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/daytrader/web/src/webapp/WEB-INF/web.xml (original)
+++ geronimo/branches/1.1/applications/daytrader/web/src/webapp/WEB-INF/web.xml Thu Apr 20
14:07:47 2006
@@ -410,13 +410,13 @@
          <message-destination-ref-name>jms/TradeBrokerQueue</message-destination-ref-name>
          <message-destination-type>javax.jms.Queue</message-destination-type>
          <message-destination-usage>Produces</message-destination-usage>
-         <message-destination-link>daytrader-ejb-${daytrader_version}.jar#TradeBrokerQueue</message-destination-link>
+         <message-destination-link>dt-ejb.jar#TradeBrokerQueue</message-destination-link>
       </message-destination-ref>
       <message-destination-ref id="MessageDestinationRef_2">
          <message-destination-ref-name>jms/TradeStreamerTopic</message-destination-ref-name>
          <message-destination-type>javax.jms.Topic</message-destination-type>
          <message-destination-usage>Produces</message-destination-usage>
-         <message-destination-link>daytrader-ejb-${daytrader_version}.jar#TradeStreamerTopic</message-destination-link>
+         <message-destination-link>dt-ejb.jar#TradeStreamerTopic</message-destination-link>
       </message-destination-ref>
       <service-ref>
         <description>WSDL Service Trade</description>

Modified: geronimo/branches/1.1/applications/daytrader/wsappclient/src/client/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/daytrader/wsappclient/src/client/META-INF/MANIFEST.MF?rev=395697&r1=395696&r2=395697&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/daytrader/wsappclient/src/client/META-INF/MANIFEST.MF
(original)
+++ geronimo/branches/1.1/applications/daytrader/wsappclient/src/client/META-INF/MANIFEST.MF
Thu Apr 20 14:07:47 2006
@@ -1,6 +1,4 @@
 Manifest-Version: 1.0
-Class-Path: daytrader-ejb-${daytrader_version}.jar
-Created-By: 1.4.2_08 (Sun Microsystems Inc.)
-Ant-Version: Apache Ant 1.5.4 
+Class-Path: dt-ejb.jar
 Main-Class: org.apache.geronimo.samples.daytrader.client.ws.ClientApp
 

Modified: geronimo/branches/1.1/configs/console-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/console-jetty/src/plan/plan.xml?rev=395697&r1=395696&r2=395697&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/console-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/console-jetty/src/plan/plan.xml Thu Apr 20 14:07:47 2006
@@ -21,7 +21,7 @@
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
 
     <module>
-        <web>geronimo-console-framework-${pom.currentVersion}.war</web>
+        <web>framework.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
             <context-root>/console</context-root>
             <context-priority-classloader>false</context-priority-classloader>
@@ -30,7 +30,7 @@
     </module>
 
     <module>
-        <web>geronimo-console-standard-${pom.currentVersion}.war</web>
+        <web>standard.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
             <context-root>/console-standard</context-root>
             <context-priority-classloader>false</context-priority-classloader>

Modified: geronimo/branches/1.1/configs/console-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/console-tomcat/src/plan/plan.xml?rev=395697&r1=395696&r2=395697&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/console-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/console-tomcat/src/plan/plan.xml Thu Apr 20 14:07:47 2006
@@ -21,7 +21,7 @@
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
 
     <module>
-        <web>geronimo-console-framework-${pom.currentVersion}.war</web>
+        <web>framework.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
             <context-root>/console</context-root>
             <context-priority-classloader>false</context-priority-classloader>
@@ -31,7 +31,7 @@
     </module>
 
     <module>
-        <web>geronimo-console-standard-${pom.currentVersion}.war</web>
+        <web>standard.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
             <context-root>/console-standard</context-root>
             <context-priority-classloader>false</context-priority-classloader>

Modified: geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml?rev=395697&r1=395696&r2=395697&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/daytrader-jetty/src/plan/plan.xml Thu Apr 20 14:07:47 2006
@@ -2,7 +2,7 @@
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
 
     <module>
-        <web>daytrader-web-${daytrader_version}.war</web>
+        <web>web.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
             <context-priority-classloader>false</context-priority-classloader>
             <service-ref>
@@ -28,7 +28,7 @@
     ##
     -->
     <module>
-        <ejb>daytrader-ejb-${daytrader_version}.jar</ejb>     <!--  Note this
must match the -->
+        <ejb>dt-ejb.jar</ejb>     <!--  Note this must match the -->
         <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
 
 
@@ -503,7 +503,7 @@
 
 
     <module>
-        <java>daytrader-streamer-${daytrader_version}.jar</java>
+        <java>streamer.jar</java>
         <application-client  xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1">
             <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <configId>

Modified: geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml?rev=395697&r1=395696&r2=395697&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/daytrader-tomcat/src/plan/plan.xml Thu Apr 20 14:07:47 2006
@@ -2,7 +2,7 @@
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
 
     <module>
-        <web>daytrader-web-${daytrader_version}.war</web>
+        <web>web.war</web>
         <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1">
             <context-priority-classloader>false</context-priority-classloader>
             <service-ref>
@@ -28,7 +28,7 @@
     ##
     -->
     <module>
-        <ejb>daytrader-ejb-${daytrader_version}.jar</ejb>     <!--  Note this
must match the -->
+        <ejb>dt-ejb.jar</ejb>     <!--  Note this must match the -->
         <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
 
 
@@ -503,7 +503,7 @@
 
 
     <module>
-        <java>daytrader-streamer-${daytrader_version}.jar</java>
+        <java>streamer.jar</java>
         <application-client  xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1">
             <client-environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
                 <configId>

Modified: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java?rev=395697&r1=395696&r2=395697&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java (original)
+++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java Thu
Apr 20 14:07:47 2006
@@ -297,8 +297,8 @@
 
     /**
      * Assuming the argument represents a service running in the kernel,
-     * returns an ObjectName for it.  If the argument is not a service or the
-     * kernel cannot produce an ObjectName for it, returns null.
+     * returns an AbstractName for it.  If the argument is not a service or the
+     * kernel cannot produce an AbstractName for it, returns null.
      */
     AbstractName getAbstractNameFor(Object service);
 



Mime
View raw message