geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r545221 - in /geronimo/sandbox/magicGball: magicGball-client/ magicGball-client/src/main/java/org/acme/ magicGball-ear/ magicGball-ear/src/main/plan/ magicGball-ejb/src/main/resources/META-INF/ magicGball-ejb/src/main/resources/META-INF/wsd...
Date Thu, 07 Jun 2007 15:50:27 GMT
Author: rickmcguire
Date: Thu Jun  7 08:50:25 2007
New Revision: 545221

URL: http://svn.apache.org/viewvc?view=rev&rev=545221
Log:
GERONIMO-3222 Updates to Corba sample MagicGball to work on Geronimo 2.0


Modified:
    geronimo/sandbox/magicGball/magicGball-client/pom.xml
    geronimo/sandbox/magicGball/magicGball-client/src/main/java/org/acme/MagicGBallClient.java
    geronimo/sandbox/magicGball/magicGball-ear/pom.xml
    geronimo/sandbox/magicGball/magicGball-ear/src/main/plan/magicgball-corba-nosec-plan.xml
    geronimo/sandbox/magicGball/magicGball-ear/src/main/plan/magicgball-corba-plan.xml
    geronimo/sandbox/magicGball/magicGball-ejb/src/main/resources/META-INF/ejb-jar.xml
    geronimo/sandbox/magicGball/magicGball-ejb/src/main/resources/META-INF/wsdl/MagicGBall.wsdl
    geronimo/sandbox/magicGball/magicGball-web/pom.xml
    geronimo/sandbox/magicGball/magicGball-web/src/main/webapp/WEB-INF/web.xml

Modified: geronimo/sandbox/magicGball/magicGball-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/magicGball/magicGball-client/pom.xml?view=diff&rev=545221&r1=545220&r2=545221
==============================================================================
--- geronimo/sandbox/magicGball/magicGball-client/pom.xml (original)
+++ geronimo/sandbox/magicGball/magicGball-client/pom.xml Thu Jun  7 08:50:25 2007
@@ -43,9 +43,13 @@
     <build>
         <plugins>
             <plugin>
-                <artifactId>maven-ejb-plugin</artifactId>
+                <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <generateClient>true</generateClient>
+                    <archive>
+                        <manifest>
+                            <main-class>org.acme.MagicGBallClient</main-class>
+                        </manifest>
+                    </archive>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/sandbox/magicGball/magicGball-client/src/main/java/org/acme/MagicGBallClient.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/magicGball/magicGball-client/src/main/java/org/acme/MagicGBallClient.java?view=diff&rev=545221&r1=545220&r2=545221
==============================================================================
--- geronimo/sandbox/magicGball/magicGball-client/src/main/java/org/acme/MagicGBallClient.java
(original)
+++ geronimo/sandbox/magicGball/magicGball-client/src/main/java/org/acme/MagicGBallClient.java
Thu Jun  7 08:50:25 2007
@@ -37,6 +37,7 @@
         for (int i = 0; i < args.length; i++) {
             magicGBallClient.ask(args[i]);
         }
+        System.out.println( "finished" );
     }
 
 	public void ask(String question) throws Exception {

Modified: geronimo/sandbox/magicGball/magicGball-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/magicGball/magicGball-ear/pom.xml?view=diff&rev=545221&r1=545220&r2=545221
==============================================================================
--- geronimo/sandbox/magicGball/magicGball-ear/pom.xml (original)
+++ geronimo/sandbox/magicGball/magicGball-ear/pom.xml Thu Jun  7 08:50:25 2007
@@ -33,18 +33,25 @@
     <name>Geronimo Applications, The Magic G Ball :: EAR</name>
     <packaging>ear</packaging>
     
+    <properties>
+        <!-- This property is required by the car:package mojo -->
+        <geronimo_version>${version}</geronimo_version>
+    </properties>
+    
     <dependencies>
         
         <dependency>
             <groupId>org.apache.geronimo.applications.magicGball</groupId>
             <artifactId>magicGball-client</artifactId>
             <version>${version}</version>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>org.apache.geronimo.applications.magicGball</groupId>
             <artifactId>magicGball-ejb</artifactId>
             <version>${version}</version>
+            <type>ejb</type>
         </dependency>
         
         <dependency>
@@ -56,4 +63,72 @@
         
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-ear-plugin</artifactId>
+                <version>2.3</version>
+                <configuration>
+                    <displayName>magicGball 2.0</displayName>
+                    <description>Geronimo Applications, The Magic G Ball</description>
+                    <version>1.4</version>
+                    <modules>
+                        <webModule>
+                            <groupId>org.apache.geronimo.applications.magicGball</groupId>
+                            <artifactId>magicGball-web</artifactId>
+                            <contextRoot>/magicGball</contextRoot>
+                            <bundleFileName>magicGball-web-${geronimo_version}.war</bundleFileName>
+                        </webModule>
+                        <ejbModule>
+                            <groupId>org.apache.geronimo.applications.magicGball</groupId>
+                            <artifactId>magicGball-ejb</artifactId>
+                            <bundleFileName>magicGball-ejb-${geronimo_version}.jar</bundleFileName>
+                        </ejbModule>
+                        <javaModule>
+                            <groupId>org.apache.geronimo.applications.magicGball</groupId>
+                            <artifactId>magicGball-client</artifactId>
+                            <bundleFileName>magicGball-client-${geronimo_version}.jar</bundleFileName>
+                            <includeInApplicationXml>true</includeInApplicationXml>
+                        </javaModule>
+                    </modules>
+                </configuration>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <version>2.0-SNAPSHOT</version>
+
+                    <executions>
+                        
+                        <execution>
+                            <id>nosec-plan</id>
+                            <phase>process-resources</phase>
+                            <goals>
+                                <goal>prepare-plan</goal>
+                            </goals>
+                            <configuration>
+                                <sourceDir>${basedir}/src/main/plan</sourceDir>
+                                <planFileName>magicgball-corba-nosec-plan.xml</planFileName>
+                                <targetFile>${project.build.directory}/plan/magicgball-corba-nosec-plan.xml</targetFile>
+                            </configuration>
+                        </execution>
+                        <execution>
+                            <id>plan</id>
+                            <phase>process-resources</phase>
+                            <goals>
+                                <goal>prepare-plan</goal>
+                            </goals>
+                            <configuration>
+                                <sourceDir>${basedir}/src/main/plan</sourceDir>
+                                <planFileName>magicgball-corba-plan.xml</planFileName>
+                                <targetFile>${project.build.directory}/plan/magicgball-corba-plan.xml</targetFile>
+                            </configuration>
+                        </execution>
+                    </executions>
+            </plugin>
+        </plugins>
+    </build>
+    
+    
 </project>

Modified: geronimo/sandbox/magicGball/magicGball-ear/src/main/plan/magicgball-corba-nosec-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/magicGball/magicGball-ear/src/main/plan/magicgball-corba-nosec-plan.xml?view=diff&rev=545221&r1=545220&r2=545221
==============================================================================
--- geronimo/sandbox/magicGball/magicGball-ear/src/main/plan/magicgball-corba-nosec-plan.xml
(original)
+++ geronimo/sandbox/magicGball/magicGball-ear/src/main/plan/magicgball-corba-nosec-plan.xml
Thu Jun  7 08:50:25 2007
@@ -16,25 +16,19 @@
    limitations under the License.
 -->
 
-<application
-    xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
-    <!--configId="org/apache/geronimo/MagicGBallCorbaNoSec"-->
-    <!--parentId="geronimo/j2ee-server-corba/1.0/car">-->
-<!---->
-    <!--<import>-->
-        <!--<uri>org/apache/geronimo/Security</uri>-->
-    <!--</import>-->
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+
     <environment>
       <moduleId>
-        <groupId>geronimo</groupId>
+        <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>magicGBall-corba-nosec</artifactId>
         <version>${version}</version>
         <type>car</type>
       </moduleId>
       <dependencies>
         <dependency>
-          <groupId>geronimo</groupId>
-          <artifactId>j2ee-corba</artifactId>
+          <groupId>org.apache.geronimo.configs</groupId>
+          <artifactId>j2ee-corba-yoko</artifactId>
           <type>car</type>
         </dependency>
       </dependencies>
@@ -45,9 +39,7 @@
     <module>
         <ejb>magicGball-ejb-${geronimo_version}.jar</ejb>
         <openejb-jar
-            xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
-            <!--configId="MagicGBallEJB"-->
-            <!--parentId="org/apache/geronimo/ServerCORBA">-->
+            xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1" >
 
             <enterprise-beans>
                 <session>
@@ -62,7 +54,7 @@
                     <name>UnprotectedServer</name>
                 </reference>
                 <xml-attribute name="tssConfig">
-                    <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0"
xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+                    <tss:tss xmlns:tss="http://openejb.apache.org/xml/ns/corba-tss-config-2.1"
xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.2">
                         <tss:default-principal>
                             <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"
name="guest"/>
                         </tss:default-principal>
@@ -86,40 +78,38 @@
     </module>
 
     <module>
-        <web>magicGball-${geronimo_version}.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
-            <!--configId="MagicGBallWAR">-->
+        <web>magicGball-web-${geronimo_version}.war</web>
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
+            <context-root>/magicGball</context-root>
         </web-app>
     </module>
 
     <module>
         <java>magicGball-client-${geronimo_version}.jar</java>
-        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1">
-            <!--configId="client"-->
-            <!--clientConfigId="org/apache/geronimo/MagicGBallClientNoSec"-->
-            <!--clientParentId="org/apache/geronimo/ClientCORBA">-->
-            <!--<import>-->
-                <!--<uri>org/apache/geronimo/ClientSecurity</uri>-->
-            <!--</import>-->
+        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
             <client-environment>
               <moduleId>
-                <groupId>geronimo</groupId>
+                <groupId>org.apache.geronimo.samples</groupId>
                 <artifactId>magicGBall-corba-nosec-client</artifactId>
                 <version>${version}</version>
                 <type>car</type>
               </moduleId>
               <dependencies>
                 <dependency>
-                  <groupId>geronimo</groupId>
-                  <artifactId>client-corba</artifactId>
+                  <groupId>org.apache.geronimo.configs</groupId>
+                  <artifactId>client-corba-yoko</artifactId>
+                  <type>car</type>
+                </dependency>
+                <dependency>
+                  <groupId>org.apache.geronimo.configs</groupId>
+                  <artifactId>client-transaction</artifactId>
                   <type>car</type>
                 </dependency>
               </dependencies>
               <hidden-classes/>
               <non-overridable-classes/>
             </client-environment>
-            <server-environment>
-            </server-environment>
+            <server-environment/>
 
             <ejb-ref>
                 <ref-name>mGball</ref-name>
@@ -129,18 +119,16 @@
             </ejb-ref>
             <realm-name>client-properties-realm</realm-name>
             <callback-handler>org.acme.MagicGBallCallbackHandler</callback-handler>
-            <gbean name="NoSecurity" class="org.apache.geronimo.corba.CSSBean">
-                <reference name="ThreadPool">
-                    <name>DefaultThreadPool</name>
+            <gbean name="NoSecurity" class="org.apache.geronimo.corba.CSSBeanGBean">
+                <reference name="TransactionManager">
+                    <name>TransactionManager</name>
                 </reference>
-                <reference name="TransactionContextManager">
-                    <name>TransactionContextManager</name>
+                <reference name="ConfigAdapter">
+                    <name>ORBConfigAdapter</name>
                 </reference>
-                <attribute name="configAdapter">org.apache.geronimo.corba.sunorb.SunORBConfigAdapter</attribute>
                 <attribute name="description">NoSecurity</attribute>
-                <attribute name="cssArgs"></attribute>
                 <xml-attribute name="cssConfig">
-                    <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
+                    <css:css xmlns:css="http://openejb.apache.org/xml/ns/corba-css-config-2.1">
                         <css:compoundSecMechTypeList>
                             <css:compoundSecMech>
                                 <css:SSL>

Modified: geronimo/sandbox/magicGball/magicGball-ear/src/main/plan/magicgball-corba-plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/magicGball/magicGball-ear/src/main/plan/magicgball-corba-plan.xml?view=diff&rev=545221&r1=545220&r2=545221
==============================================================================
--- geronimo/sandbox/magicGball/magicGball-ear/src/main/plan/magicgball-corba-plan.xml (original)
+++ geronimo/sandbox/magicGball/magicGball-ear/src/main/plan/magicgball-corba-plan.xml Thu
Jun  7 08:50:25 2007
@@ -16,26 +16,19 @@
    limitations under the License.
 -->
 
-<application
-    xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
-<!--    configId="org/apache/geronimo/MagicGBallCorba"
-    parentId="org/apache/geronimo/ServerCORBA">
-
-    <import>
-        <uri>org/apache/geronimo/Security</uri>
-    </import>
-    -->
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+    
     <environment>
       <moduleId>
-        <groupId>geronimo</groupId>
+        <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>magicGBall-corba-ssl</artifactId>
         <version>${version}</version>
         <type>car</type>
       </moduleId>
       <dependencies>
         <dependency>
-          <groupId>geronimo</groupId>
-          <artifactId>j2ee-corba</artifactId>
+          <groupId>org.apache.geronimo.configs</groupId>
+          <artifactId>j2ee-corba-yoko</artifactId>
           <type>car</type>
         </dependency>
       </dependencies>
@@ -47,9 +40,6 @@
         <ejb>magicGball-ejb-${geronimo_version}.jar</ejb>
         <openejb-jar
             xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
-<!--            configId="MagicGBallEJB"
-            parentId="org/apache/geronimo/ServerCORBA">
-    -->
             <enterprise-beans>
                 <session>
                     <ejb-name>MagicGBall</ejb-name>
@@ -63,11 +53,11 @@
                     <name>Server</name>
                 </reference>
                 <xml-attribute name="tssConfig">
-                    <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0"
xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
+                    <tss:tss xmlns:tss="http://openejb.apache.org/xml/ns/corba-tss-config-2.1"
xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.2">
                         <tss:default-principal>
                             <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"
name="guest"/>
                         </tss:default-principal>
-                        <tss:SSL port="${PlanORBSSLPort}" hostname="${PlanORBSSLHost}">
+                        <tss:SSL port="2001" hostname="localhost">
                             <tss:supports>Integrity Confidentiality EstablishTrustInTarget</tss:supports>
                             <tss:requires>Integrity Confidentiality</tss:requires>
                         </tss:SSL>
@@ -89,32 +79,31 @@
     </module>
 
     <module>
-        <web>magicGball-${geronimo_version}.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.1">
-            <!--configId="MagicGBallWAR">-->
+        <web>magicGball-web-${geronimo_version}.war</web>
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
+            <context-root>/magicGball</context-root>
         </web-app>
     </module>
 
     <module>
         <java>magicGball-client-${geronimo_version}.jar</java>
-        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1">
-            <!--configId="client"-->
-            <!--clientConfigId="org/apache/geronimo/MagicGBallClient"-->
-            <!--clientParentId="org/apache/geronimo/ClientCORBA">-->
-            <!--<import>-->
-                <!--<uri>org/apache/geronimo/ClientSecurity</uri>-->
-            <!--</import>-->
+        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2">
             <client-environment>
               <moduleId>
-                <groupId>geronimo</groupId>
+                <groupId>org.apache.geronimo.samples</groupId>
                 <artifactId>magicGBall-corba-ssl-client</artifactId>
                 <version>${version}</version>
                 <type>car</type>
               </moduleId>
               <dependencies>
                 <dependency>
-                  <groupId>geronimo</groupId>
-                  <artifactId>client-corba</artifactId>
+                  <groupId>org.apache.geronimo.configs</groupId>
+                  <artifactId>client-corba-yoko</artifactId>
+                  <type>car</type>
+                </dependency>
+                <dependency>
+                  <groupId>org.apache.geronimo.configs</groupId>
+                  <artifactId>client-transaction</artifactId>
                   <type>car</type>
                 </dependency>
               </dependencies>
@@ -132,28 +121,18 @@
             <realm-name>client-properties-realm</realm-name>
             <callback-handler>org.acme.MagicGBallCallbackHandler</callback-handler>
             <gbean name="SSLClientPassword" class="org.apache.geronimo.corba.CSSBean">
-                <reference name="ThreadPool">
-                    <name>DefaultThreadPool</name>
+                <reference name="TransactionManager">
+                    <name>TransactionManager</name>
                 </reference>
-                <reference name="TransactionContextManager">
-                    <name>TransactionContextManager</name>
+                <reference name="ConfigAdapter">
+                    <name>ORBConfigAdapter</name>
+                </reference>
+                <reference name="SSLConfig">
+                    <name>CORBASSLConfig</name>
                 </reference>
-                <attribute name="configAdapter">org.apache.geronimo.corba.sunorb.SunORBConfigAdapter</attribute>
                 <attribute name="description">SSLClientPassword</attribute>
-                <xml-attribute name="nssConfig">
-                    <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
-                        <css:compoundSecMechTypeList>
-                            <css:compoundSecMech>
-                                <css:SSL>
-                                    <css:supports>Integrity Confidentiality EstablishTrustInTarget
EstablishTrustInClient</css:supports>
-                                    <css:requires></css:requires>
-                                </css:SSL>
-                            </css:compoundSecMech>
-                        </css:compoundSecMechTypeList>
-                    </css:css>
-                </xml-attribute>
                 <xml-attribute name="cssConfig">
-                    <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
+                    <css:css xmlns:css="http://openejb.apache.org/xml/ns/corba-css-config-2.1">
                         <css:compoundSecMechTypeList>
                             <css:compoundSecMech>
                                 <css:SSL>
@@ -186,10 +165,10 @@
 
     <dep:gbean name="default"
          class="org.apache.geronimo.security.realm.GenericSecurityRealm"
-        xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+        xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
          <dep:attribute name="realmName">default</dep:attribute>
          <dep:xml-reference name="LoginModuleConfiguration">
-             <lc:login-config xmlns:lc="http://geronimo.apache.org/xml/ns/loginconfig-1.1">
+             <lc:login-config xmlns:lc="http://geronimo.apache.org/xml/ns/loginconfig-1.2">
                  <lc:login-module control-flag="REQUIRED" server-side="true">
                      <lc:login-domain-name>default</lc:login-domain-name>
                      <lc:login-module-class>org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</lc:login-module-class>

Modified: geronimo/sandbox/magicGball/magicGball-ejb/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/magicGball/magicGball-ejb/src/main/resources/META-INF/ejb-jar.xml?view=diff&rev=545221&r1=545220&r2=545221
==============================================================================
--- geronimo/sandbox/magicGball/magicGball-ejb/src/main/resources/META-INF/ejb-jar.xml (original)
+++ geronimo/sandbox/magicGball/magicGball-ejb/src/main/resources/META-INF/ejb-jar.xml Thu
Jun  7 08:50:25 2007
@@ -16,8 +16,7 @@
    limitations under the License.
 -->
 
-<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
"http://java.sun.com/dtd/ejb-jar_2_0.dtd">
-<ejb-jar>
+<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee" version="2.1">
 	<display-name>MagicGBallEJB</display-name>
 	<enterprise-beans>
 		<session id="MagicGBall">
@@ -26,6 +25,7 @@
 			<remote>org.acme.MagicGBall</remote>
 			<local-home>org.acme.MagicGBallLocalHome</local-home>
 			<local>org.acme.MagicGBallLocal</local>
+			<service-endpoint>org.acme.MagicGBallEndpoint</service-endpoint>
 			<ejb-class>org.acme.MagicGBallBean</ejb-class>
 			<session-type>Stateless</session-type>
 			<transaction-type>Container</transaction-type>

Modified: geronimo/sandbox/magicGball/magicGball-ejb/src/main/resources/META-INF/wsdl/MagicGBall.wsdl
URL: http://svn.apache.org/viewvc/geronimo/sandbox/magicGball/magicGball-ejb/src/main/resources/META-INF/wsdl/MagicGBall.wsdl?view=diff&rev=545221&r1=545220&r2=545221
==============================================================================
--- geronimo/sandbox/magicGball/magicGball-ejb/src/main/resources/META-INF/wsdl/MagicGBall.wsdl
(original)
+++ geronimo/sandbox/magicGball/magicGball-ejb/src/main/resources/META-INF/wsdl/MagicGBall.wsdl
Thu Jun  7 08:50:25 2007
@@ -32,7 +32,7 @@
     </message>
 
     <portType name="MagicGBallType">
-        <operation name="echo" parameterOrder="String_1">
+        <operation name="ask" parameterOrder="String_1">
             <input message="mgb:askRequest"/>
             <output message="mgb:askResponse"/>
         </operation>
@@ -40,7 +40,7 @@
 
     <binding name="MagicGBallBinding" type="mgb:MagicGBallType">
         <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
-        <operation name="echo">
+        <operation name="ask">
             <soap:operation soapAction=""/>
             <input>
                 <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded"
namespace="http://acme.org/magicGball"/>

Modified: geronimo/sandbox/magicGball/magicGball-web/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/magicGball/magicGball-web/pom.xml?view=diff&rev=545221&r1=545220&r2=545221
==============================================================================
--- geronimo/sandbox/magicGball/magicGball-web/pom.xml (original)
+++ geronimo/sandbox/magicGball/magicGball-web/pom.xml Thu Jun  7 08:50:25 2007
@@ -46,8 +46,9 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
+                <groupId>org.codehaus.mojo.jspc</groupId>
                 <artifactId>jspc-maven-plugin</artifactId>
+                <version>2.0-SNAPSHOT</version>
             </plugin>
             
             <plugin>

Modified: geronimo/sandbox/magicGball/magicGball-web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/magicGball/magicGball-web/src/main/webapp/WEB-INF/web.xml?view=diff&rev=545221&r1=545220&r2=545221
==============================================================================
--- geronimo/sandbox/magicGball/magicGball-web/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/sandbox/magicGball/magicGball-web/src/main/webapp/WEB-INF/web.xml Thu Jun  7
08:50:25 2007
@@ -39,6 +39,6 @@
 		<ejb-ref-type>Session</ejb-ref-type>
 		<local-home>org.acme.MagicGBallLocalHome</local-home>
 		<local>org.acme.MagicGBallLocal</local>
-		<ejb-link>magicGball-ejb-1.2-SNAPSHOT.jar#MagicGBall</ejb-link>
+		<ejb-link>MagicGBall</ejb-link>
 	</ejb-local-ref>
 </web-app>



Mime
View raw message