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/07 22:01:38 UTC
svn commit: r307180 - in /geronimo/trunk/modules/assembly: maven.xml
src/plan/j2ee-client-corba-plan.xml src/plan/j2ee-client-security-plan.xml
src/var/config/config.client.xml
Author: djencks
Date: Fri Oct 7 13:01:35 2005
New Revision: 307180
URL: http://svn.apache.org/viewcvs?rev=307180&view=rev
Log:
Port izpack updates from M5. Make client config.xml. Improve client corba setup
Added:
geronimo/trunk/modules/assembly/src/var/config/config.client.xml
Modified:
geronimo/trunk/modules/assembly/maven.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-client-corba-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-client-security-plan.xml
Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=307180&r1=307179&r2=307180&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Fri Oct 7 13:01:35 2005
@@ -222,7 +222,12 @@
<!-- Preprocess all mungible content using velocity -->
<!-- ============================================== -->
- <attainGoal name="assembly:izpack-prepare"/>
+ <!-- Write out a copy of config.xml with substitution variables intact -->
+ <ant:mkdir dir="${geronimo.assembly.dir}/var/config"/>
+ <velocity:merge basedir="${basedir}/src/var/config"
+ template="config.xml"
+ name="${geronimo.assembly.dir}/var/config/config.template.xml"/>
+<!-- <attainGoal name="assembly:izpack-prepare"/>-->
<!-- Substitution variables for default hostname, ports, etc. -->
<j:set var="PlanServerHostname" value="0.0.0.0"/>
<j:set var="PlanNamingPort" value="1099"/>
@@ -458,15 +463,15 @@
<attainGoal name="init-database"/>
<!-- Prepare the Installer directory -->
- <ant:copy todir="${basedir}/target/installer">
- <ant:fileset dir="${geronimo.assembly.dir}"/>
- </ant:copy>
- <ant:echo file="${basedir}/target/installer/var/security/users.properties" message="$${SecurityDefaultUser}=$${SecurityDefaultPassword}"/>
- <ant:echo file="${basedir}/target/installer/var/security/groups.properties" message="admin=$${SecurityDefaultUser}"/>
+<!-- <ant:copy todir="${basedir}/target/installer">-->
+<!-- <ant:fileset dir="${geronimo.assembly.dir}"/>-->
+<!-- </ant:copy>-->
+<!-- <ant:echo file="${basedir}/target/installer/var/security/users.properties" message="$${SecurityDefaultUser}=$${SecurityDefaultPassword}"/>-->
+<!-- <ant:echo file="${basedir}/target/installer/var/security/groups.properties" message="admin=$${SecurityDefaultUser}"/>-->
<!-- <ant:echo file="${basedir}/target/installer/var/config/config.list" message="org/apache/geronimo/System"/>-->
- <ant:move file="${basedir}/target/installer/config.xml"
- tofile="${basedir}/target/installer/var/config/config.xml"/>
+<!-- <ant:move file="${basedir}/target/installer/config.xml"-->
+<!-- tofile="${basedir}/target/installer/var/config/config.xml"/>-->
</goal>
<goal name="assembly:izpack-prepare">
@@ -474,13 +479,21 @@
<!-- TODO use the zip file instead of copying -->
<!-- Copy over the IzPack Installer files -->
<ant:mkdir dir="${basedir}/target/installer"/>
+ <ant:mkdir dir="${basedir}/target/tmp"/>
+
+ <!-- unpack the zip into the install dir -->
+ <ant:unzip src="${basedir}/target/distributions/geronimo-${geronimo_version}.zip"
+ dest="${basedir}/target/tmp"/>
+ <ant:copy todir="${basedir}/target/installer">
+ <ant:fileset dir="${basedir}/target/tmp/geronimo-${geronimo_version}"/>
+ </ant:copy>
<fileScanner var="installFiles">
<fileset dir="${basedir}/src/izpack">
<include name="*.xml"/>
</fileset>
</fileScanner>
<j:set var="GeronimoVersion" value="${geronimo_version}"/>
- <j:set var="ReleaseNotesVersion" value="1.0-M4"/>
+ <j:set var="ReleaseNotesVersion" value="1.0-M5"/>
<j:forEach var="installer" items="${installFiles.iterator()}">
<j:set var="installerName" value="${installer.name}"/>
<echo>Processing installer file ${installerName}</echo>
@@ -493,8 +506,15 @@
<!-- Write out a copy of config.xml with substitution variables intact -->
<velocity:merge basedir="${basedir}/src/var/config"
template="config.xml"
- name="${basedir}/target/installer/config.xml"/>
+ name="${basedir}/target/installer/var/config/config.xml"/>
+ <!-- Prepare the Installer directory -->
+ <ant:echo file="${basedir}/target/installer/var/security/users.properties" message="$${SecurityDefaultUser}=$${SecurityDefaultPassword}"/>
+ <ant:echo file="${basedir}/target/installer/var/security/groups.properties" message="admin=$${SecurityDefaultUser}"/>
+<!-- <ant:echo file="${basedir}/target/installer/var/config/config.list" message="org/apache/geronimo/System"/>-->
+ <ant:copy file="${basedir}/target/installer/var/config/config.izpack.list" tofile="${basedir}/target/installer/var/config/config.list" overwrite="true"/>
+ <!-- <ant:move file="${basedir}/target/installer/config.xml"-->
+ <!-- tofile="${basedir}/target/installer/var/config/config.xml"/>-->
</goal>
<goal name="online.deploy">
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-client-corba-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-client-corba-plan.xml?rev=307180&r1=307179&r2=307180&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-client-corba-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-client-corba-plan.xml Fri Oct 7 13:01:35 2005
@@ -38,9 +38,10 @@
<module>*</module>
<name>SecurityService</name>
</reference>
- <attribute name="args">-ORBPort, 9683, -ORBInitRef, NameService=corbaloc::localhost:2809/NameService</attribute>
+ <!-- PlanORBSSLPort was 9683-->
+ <attribute name="args">-ORBPort, ${PlanORBSSLPort}, -ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
<attribute name="props">
- com.sun.CORBA.ORBServerHost=localhost
+ com.sun.CORBA.ORBServerHost=${PlanORBSSLHost}
</attribute>
</gbean>
@@ -115,7 +116,7 @@
<css:supports>Integrity Confidentiality EstablishTrustInClient</css:supports>
<css:requires>Integrity Confidentiality</css:requires>
</css:SSL>
- <css:GSSUPStatic username="j2ee" password="j2ee" domain="default" />
+ <css:GSSUPDynamic domain="default" />
<css:sasMech>
<css:ITTAbsent/>
</css:sasMech>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-client-security-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-client-security-plan.xml?rev=307180&r1=307179&r2=307180&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-client-security-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-client-security-plan.xml Fri Oct 7 13:01:35 2005
@@ -89,6 +89,11 @@
<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-module control-flag="REQUIRED" server-side="true">
+ <lc:login-domain-name>default</lc:login-domain-name>
+ <lc:login-module-class>org.apache.geronimo.security.jaas.NamedUPCredentialLoginModule</lc:login-module-class>
+ <lc:option name="org.apache.geronimo.jaas.NamedUPCredentialLoginModule.Name">default</lc:option>
+ </lc:login-module>
</lc:login-config>
</xml-reference>
<reference name="ServerInfo">
Added: geronimo/trunk/modules/assembly/src/var/config/config.client.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/config/config.client.xml?rev=307180&view=auto
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.client.xml (added)
+++ geronimo/trunk/modules/assembly/src/var/config/config.client.xml Fri Oct 7 13:01:35 2005
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<attributes xmlns="http://geronimo.apache.org/xml/ns/attributes">
+ <configuration name="org/apache/geronimo/ClientCORBA">
+ <gbean name="Server">
+ <attribute name="args">-ORBPort, ${PlanORBSSLPort}, -ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
+ <attribute name="props">
+ com.sun.CORBA.ORBServerHost=${PlanORBSSLHost}
+ </attribute>
+ </gbean>
+ </configuration>
+</attributes>