You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/10/06 07:32:02 UTC
svn commit: r306532 - in /geronimo/trunk/applications/magicGball: maven.xml
project.xml src/plan/magicgball-corba-nosec-plan.xml
src/plan/magicgball-corba-plan.xml
src/resources/ear/META-INF/application.xml src/webapp/WEB-INF/web.xml
Author: djencks
Date: Wed Oct 5 22:31:57 2005
New Revision: 306532
URL: http://svn.apache.org/viewcvs?rev=306532&view=rev
Log:
Progress with corba. Copying src/plan/magicgball-corba-nosec-plan.xml over src/plan/magicgball-corba-plan.xml should work. Added goals to maven.xml to run client etc. SSL still does not work
Added:
geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml
Modified:
geronimo/trunk/applications/magicGball/maven.xml
geronimo/trunk/applications/magicGball/project.xml
geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-plan.xml
geronimo/trunk/applications/magicGball/src/resources/ear/META-INF/application.xml
geronimo/trunk/applications/magicGball/src/webapp/WEB-INF/web.xml
Modified: geronimo/trunk/applications/magicGball/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/magicGball/maven.xml?rev=306532&r1=306531&r2=306532&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/maven.xml (original)
+++ geronimo/trunk/applications/magicGball/maven.xml Wed Oct 5 22:31:57 2005
@@ -14,7 +14,7 @@
<goal name="rebuild" prereqs="clean,build"/>
<goal name="ejb" prereqs="java:compile">
- <ant:jar destfile="target/${pom.artifactId}-ejb.jar">
+ <ant:jar destfile="target/${pom.artifactId}-ejb-${geronimo_version}.jar">
<fileset dir="target/classes">
<exclude name="**/*Servlet.class"/>
<exclude name="**/*Client.class"/>
@@ -24,7 +24,7 @@
</goal>
<goal name="client" prereqs="java:compile">
- <ant:jar destfile="target/${pom.artifactId}-client.jar">
+ <ant:jar destfile="target/${pom.artifactId}-client-${geronimo_version}.jar">
<fileset dir="target/classes">
<include name="**/*Client.class"/>
<include name="**/MagicGBall.class"/>
@@ -39,11 +39,11 @@
</goal>
<goal name="ear" prereqs="ejb,war:war,client">
- <ant:jar destfile="target/${pom.artifactId}.ear">
+ <ant:jar destfile="target/${pom.artifactId}-${geronimo_version}.ear">
<fileset dir="target">
- <include name="${pom.artifactId}-ejb.jar"/>
- <include name="${pom.artifactId}-client.jar"/>
- <include name="${pom.artifactId}.war"/>
+ <include name="${pom.artifactId}-ejb-${geronimo_version}.jar"/>
+ <include name="${pom.artifactId}-client-${geronimo_version}.jar"/>
+ <include name="${pom.artifactId}-${geronimo_version}.war"/>
</fileset>
<fileset dir="src/resources/ear"/>
</ant:jar>
@@ -53,12 +53,17 @@
<ant:mkdir dir="target/docs"/>
</goal>
- <goal name="startServer" prereqs="ear">
- <j:set var="geronimo.server.corba.options" value="-Djavax.rmi.CORBA.UtilClass=org.openejb.corba.util.UtilDelegateImpl -Dorg.openejb.corba.UtilDelegateClass=com.sun.corba.se.internal.POA.ShutdownUtilDelegate -Dorg.omg.CORBA.ORBSingletonClass=com.sun.corba.se.internal.corba.ORBSingleton -Dorg.omg.CORBA.ORBClass=org.openejb.corba.sunorb.OpenEJBORB -Djavax.rmi.CORBA.PortableRemoteObjectClass=com.sun.corba.se.internal.javax.rmi.PortableRemoteObject"/>
+ <goal name="initVars">
+ <j:set var="geronimo.home" value="${maven.build.dir}/geronimo-${geronimo_version}"/>
+ <j:set var="geronimo.corba.options" value="-Djavax.rmi.CORBA.UtilClass=org.openejb.corba.util.UtilDelegateImpl -Dorg.openejb.corba.UtilDelegateClass=com.sun.corba.se.internal.POA.ShutdownUtilDelegate -Dorg.omg.CORBA.ORBSingletonClass=com.sun.corba.se.internal.corba.ORBSingleton -Dorg.omg.CORBA.ORBClass=org.openejb.corba.sunorb.OpenEJBORB -Djavax.rmi.CORBA.PortableRemoteObjectClass=com.sun.corba.se.internal.javax.rmi.PortableRemoteObject "/>
+ <j:set var="geronimo.ssl.options" value="-Djavax.net.ssl.keyStore=${geronimo.home}/var/security/keystore -Djavax.net.ssl.keyStorePassword=secret -Djavax.net.ssl.trustStore=${geronimo.home}/var/security/keystore -Djavax.net.ssl.trustStorePassword=secret "/>
+ </goal>
+
+ <goal name="startServer" prereqs="initVars">
<deploy:unpackServer geronimoVersion="${geronimo_version}"/>
<deploy:startRemoteServer
geronimoTarget="${maven.build.dir}/geronimo-${geronimo_version}"
- vmArgs="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -Xmx512m -XX:MaxPermSize=128m ${geronimo.server.corba.options}"
+ vmArgs="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 -Xmx512m -XX:MaxPermSize=128m ${geronimo.corba.options} ${geronimo.ssl.options}"
/>
<ant:echo message="Waiting for server at: ${maven.build.dir}/geronimo-${geronimo_version}"/>
<u:sleep millis="60000"/>
@@ -71,16 +76,52 @@
<echo message="runtime deployer has started"/>
<u:sleep millis="7000"/>
</goal>
- <goal name="deployApp">
+ <goal name="deployApp" prereqs="ear">
<deploy:distribute
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
- module="${basedir}/target/magicGball.ear"
+ module="${basedir}/target/magicGball-${geronimo_version}.ear"
plan="${basedir}/src/plan/magicgball-corba-plan.xml"/>
+ </goal>
+ <goal name="startApp">
+ <deploy:start
+ uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ id="org/apache/geronimo/MagicGBallCorba"/>
+ </goal>
+ <goal name="stopApp">
+ <deploy:stop
+ uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ id="org/apache/geronimo/MagicGBallCorba"/>
+ </goal>
+ <goal name="undeployApp">
+ <deploy:undeploy
+ uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ id="org/apache/geronimo/MagicGBallCorba"/>
+ </goal>
+ <goal name="runClient" prereqs="initVars">
+ <j:if test="${context.getVariable('enable.debug') == 'true'}">
+ <j:set var="geronimo.client.debug.options" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5003"/>
+ </j:if>
+ <java classname="org.apache.geronimo.system.main.ClientCommandLine" fork="yes"
+ jvmargs="${geronimo.client.debug.options} ${geronimo.corba.options} ${geronimo.ssl.options}">
+ <classpath>
+ <pathelement location="${maven.build.dir}/geronimo-${geronimo_version}/bin/client.jar"/>
+ </classpath>
+<!-- <jvmarg value="${geronimo.server.corba.options}"/>-->
+ <arg value="org/apache/geronimo/MagicGBallClient"/>
+ <arg value="foo"/>
+ <arg value="bar"/>
+ </java>
</goal>
-
+
</project>
Modified: geronimo/trunk/applications/magicGball/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/magicGball/project.xml?rev=306532&r1=306531&r2=306532&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/project.xml (original)
+++ geronimo/trunk/applications/magicGball/project.xml Wed Oct 5 22:31:57 2005
@@ -28,7 +28,7 @@
<name>The Magic G Ball</name>
<id>magicGball</id>
- <currentVersion>0.01234-alpha0</currentVersion>
+<!-- <currentVersion>0.01234-alpha0</currentVersion>-->
<!-- ============ -->
<!-- Dependencies -->
Added: geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml?rev=306532&view=auto
==============================================================================
--- geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml (added)
+++ geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-nosec-plan.xml Wed Oct 5 22:31:57 2005
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application
+ xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
+ configId="org/apache/geronimo/MagicGBallCorbaNoSec"
+ parentId="org/apache/geronimo/ServerCORBA">
+
+ <import>
+ <uri>org/apache/geronimo/Security</uri>
+ </import>
+
+ <module>
+ <ejb>magicGball-ejb-1.0-SNAPSHOT.jar</ejb>
+ <openejb-jar
+ xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.0"
+ configId="MagicGBallEJB"
+ parentId="org/apache/geronimo/ServerCORBA">
+
+ <enterprise-beans>
+ <session>
+ <ejb-name>MagicGBall</ejb-name>
+ <jndi-name>MagicGBall</jndi-name>
+ <tss-link>IdentityTokenNoSecurity </tss-link>
+ </session>
+ </enterprise-beans>
+ </openejb-jar>
+ </module>
+
+ <module>
+ <web>magicGball-1.0-SNAPSHOT.war</web>
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0" configId="MagicGBallWAR">
+ <context-priority-classloader>false</context-priority-classloader>
+ </web-app>
+ </module>
+
+ <module>
+ <java>magicGball-client-1.0-SNAPSHOT.jar</java>
+ <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client"
+ configId="client"
+ clientConfigId="org/apache/geronimo/MagicGBallClient"
+ clientParentId="org/apache/geronimo/ClientCORBA">
+ <import>
+ <uri>org/apache/geronimo/ClientSecurity</uri>
+ </import>
+ <ejb-ref>
+ <ref-name>mGball</ref-name>
+ <ns-corbaloc>corbaloc::localhost:1050/NameService</ns-corbaloc>
+ <name>MagicGBall</name>
+ <css-link>NoSecurity</css-link>
+ </ejb-ref>
+ <realm-name>client-properties-realm</realm-name>
+ <callback-handler>org.acme.MagicGBallCallbackHandler</callback-handler>
+ </application-client>
+ </module>
+
+ <security>
+ <default-principal realm-name="geronimo-properties-realm">
+ <principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="system"/>
+ </default-principal>
+ <role-mappings>
+ <role role-name="admin">
+ <realm realm-name="geronimo-properties-realm">
+ <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin" designated-run-as="true"/>
+ </realm>
+ </role>
+ </role-mappings>
+ </security>
+
+</application>
Modified: geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-plan.xml?rev=306532&r1=306531&r2=306532&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-plan.xml (original)
+++ geronimo/trunk/applications/magicGball/src/plan/magicgball-corba-plan.xml Wed Oct 5 22:31:57 2005
@@ -9,7 +9,7 @@
</import>
<module>
- <ejb>magicGball-ejb.jar</ejb>
+ <ejb>magicGball-ejb-1.0-SNAPSHOT.jar</ejb>
<openejb-jar
xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.0"
configId="MagicGBallEJB"
@@ -19,21 +19,21 @@
<session>
<ejb-name>MagicGBall</ejb-name>
<jndi-name>MagicGBall</jndi-name>
- <tss-link>SSLClientPassword</tss-link>
+ <tss-link>SSLClientPassword </tss-link>
</session>
</enterprise-beans>
</openejb-jar>
</module>
<module>
- <web>magicGball.war</web>
+ <web>magicGball-1.0-SNAPSHOT.war</web>
<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0" configId="MagicGBallWAR">
<context-priority-classloader>false</context-priority-classloader>
</web-app>
</module>
<module>
- <java>magicGball-client.jar</java>
+ <java>magicGball-client-1.0-SNAPSHOT.jar</java>
<application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client"
configId="client"
clientConfigId="org/apache/geronimo/MagicGBallClient"
@@ -64,5 +64,31 @@
</role>
</role-mappings>
</security>
+
+ <dep:gbean name="default"
+ class="org.apache.geronimo.security.realm.GenericSecurityRealm"
+ xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.0">
+ <dep:attribute name="realmName">default</dep:attribute>
+ <dep:xml-reference name="LoginModuleConfiguration">
+ <lc:login-config xmlns:lc="http://geronimo.apache.org/xml/ns/loginconfig">
+ <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>
+ <lc:option name="usersURI">var/security/users.properties</lc:option>
+ <lc:option name="groupsURI">var/security/groups.properties</lc:option>
+ </lc:login-module>
+ </lc:login-config>
+ </dep:xml-reference>
+ <dep:reference name="ServerInfo">
+ <dep:application>null</dep:application>
+ <dep:module>org/apache/geronimo/System</dep:module>
+ <dep:name>ServerInfo</dep:name>
+ </dep:reference>
+ <dep:reference name="LoginService">
+ <dep:application>null</dep:application>
+ <dep:module>org/apache/geronimo/Security</dep:module>
+ <dep:name>JaasLoginService</dep:name>
+ </dep:reference>
+ </dep:gbean>
</application>
Modified: geronimo/trunk/applications/magicGball/src/resources/ear/META-INF/application.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/magicGball/src/resources/ear/META-INF/application.xml?rev=306532&r1=306531&r2=306532&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/src/resources/ear/META-INF/application.xml (original)
+++ geronimo/trunk/applications/magicGball/src/resources/ear/META-INF/application.xml Wed Oct 5 22:31:57 2005
@@ -3,15 +3,15 @@
<application>
<display-name>MagicGBall</display-name>
<module>
- <ejb>magicGball-ejb.jar</ejb>
+ <ejb>magicGball-ejb-1.0-SNAPSHOT.jar</ejb>
</module>
<module>
<web>
- <web-uri>magicGball.war</web-uri>
+ <web-uri>magicGball-1.0-SNAPSHOT.war</web-uri>
<context-root>magicGball</context-root>
</web>
</module>
<module>
- <java>magicGball-client.jar</java>
+ <java>magicGball-client-1.0-SNAPSHOT.jar</java>
</module>
</application>
Modified: geronimo/trunk/applications/magicGball/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/magicGball/src/webapp/WEB-INF/web.xml?rev=306532&r1=306531&r2=306532&view=diff
==============================================================================
--- geronimo/trunk/applications/magicGball/src/webapp/WEB-INF/web.xml (original)
+++ geronimo/trunk/applications/magicGball/src/webapp/WEB-INF/web.xml Wed Oct 5 22:31:57 2005
@@ -21,6 +21,6 @@
<ejb-ref-type>Session</ejb-ref-type>
<local-home>org.acme.MagicGBallLocalHome</local-home>
<local>org.acme.MagicGBallLocal</local>
- <ejb-link>magicGball-ejb.jar#MagicGBall</ejb-link>
+ <ejb-link>magicGball-ejb-1.0-SNAPSHOT.jar#MagicGBall</ejb-link>
</ejb-local-ref>
</web-app>