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/08/24 23:05:41 UTC
svn commit: r239926 - in /geronimo/trunk/modules/assembly/src/plan:
j2ee-client-plan.xml j2ee-server-plan.xml system-database-plan.xml
Author: djencks
Date: Wed Aug 24 14:05:38 2005
New Revision: 239926
URL: http://svn.apache.org/viewcvs?rev=239926&view=rev
Log:
Make app client login actually work, and ejb timers actually work
Modified:
geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml?rev=239926&r1=239925&r2=239926&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml Wed Aug 24 14:05:38 2005
@@ -36,6 +36,10 @@
<dependency>
<uri>geronimo/jars/geronimo-client-${geronimo_version}.jar</uri>
</dependency>
+ <!-- for property editor support for some login modules/principals -->
+ <dependency>
+ <uri>geronimo/jars/geronimo-common-${geronimo_version}.jar</uri>
+ </dependency>
<dependency>
<uri>geronimo/jars/geronimo-naming-${geronimo_version}.jar</uri>
</dependency>
@@ -76,7 +80,11 @@
<dependency>
<uri>geronimo/jars/geronimo-management-${geronimo_version}.jar</uri>
</dependency>
-
+
+ <!-- remote login -->
+ <dependency>
+ <uri>activeio/jars/activeio-${activeio_version}.jar</uri>
+ </dependency>
<!--client side web services-->
<dependency>
<uri>asm/jars/asm-${asm_version}.jar</uri>
@@ -109,7 +117,7 @@
<!--client connector support-->
<gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
<attribute name="keepAliveTime">5000</attribute>
- <attribute name="poolSize">10</attribute>
+ <attribute name="poolSize">100</attribute>
<attribute name="poolName">DefaultThreadPool</attribute>
</gbean>
@@ -120,15 +128,21 @@
<attribute name="syncMaximumPoolSize">10</attribute>
<attribute name="startMaximumPoolSize">10</attribute>
<attribute name="scheduledMaximumPoolSize">10</attribute>
- <reference name="TransactionContextManager"><name>TransactionContextManager</name></reference>
+ <reference name="TransactionContextManager">
+ <name>TransactionContextManager</name>
+ </reference>
</gbean>
<gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.TransactionManagerImplGBean">
<!--no transaction log on the client-->
<attribute name="defaultTransactionTimeoutSeconds">600</attribute>
<references name="ResourceManagers">
- <pattern><gbean-name>*:j2eeType=JCAManagedConnectionFactory,*</gbean-name></pattern>
- <pattern><gbean-name>*:j2eeType=ActivationSpec,*</gbean-name></pattern>
+ <pattern>
+ <gbean-name>*:j2eeType=JCAManagedConnectionFactory,*</gbean-name>
+ </pattern>
+ <pattern>
+ <gbean-name>*:j2eeType=ActivationSpec,*</gbean-name>
+ </pattern>
</references>
</gbean>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml?rev=239926&r1=239925&r2=239926&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml Wed Aug 24 14:05:38 2005
@@ -127,7 +127,11 @@
<dependency>
<uri>activemq/jars/activemq-gbean-management-${activemq_version}.jar</uri>
</dependency>
-
+ <!-- remote login -->
+ <dependency>
+ <uri>activeio/jars/activeio-${activeio_version}.jar</uri>
+ </dependency>
+
${webcontainer}
<!-- Default security realm using properties files -->
@@ -182,6 +186,11 @@
<!-- <attribute name="reclaimPeriod">100000</attribute>-->
<attribute name="algorithm">HmacSHA1</attribute>
<attribute name="password">secret</attribute>
+ </gbean>
+
+ <gbean gbeanName="geronimo.remoting:target=JaasLoginServiceRemotingServer" class="org.apache.geronimo.security.remoting.jmx.JaasLoginServiceRemotingServer">
+ <attribute name="bindURI">tcp://0.0.0.0:4242</attribute>
+ <reference name="LoginService"><name>JaasLoginService</name></reference>
</gbean>
<gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
Modified: geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml?rev=239926&r1=239925&r2=239926&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml Wed Aug 24 14:05:38 2005
@@ -69,7 +69,7 @@
<attribute name="port">${PlanDerbyPort}</attribute>
</gbean>
- <gbean name="JDBCTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
+ <gbean name="TransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
<attribute name="repeatCount">5</attribute>
<reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>org/apache/geronimo/Server</module><name>TransactionContextManager</name></reference>
<reference name="ManagedConnectionFactoryWrapper"><moduleType>JCAResource</moduleType><name>SystemDatasource</name></reference>
@@ -78,7 +78,7 @@
<reference name="DerbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
</gbean>
- <gbean name="JDBCNonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
+ <gbean name="NonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
<reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>org/apache/geronimo/Server</module><name>TransactionContextManager</name></reference>
<reference name="ManagedConnectionFactoryWrapper"><moduleType>JCAResource</moduleType><name>SystemDatasource</name></reference>
<reference name="ThreadPool"><moduleType>J2EEModule</moduleType><module>org/apache/geronimo/Server</module><name>DefaultThreadPool</name></reference>
Re: svn commit: r239926 - in /geronimo/trunk/modules/assembly/src/plan:
j2ee-client-plan.xml j2ee-server-plan.xml system-database-plan.xml
Posted by Aaron Mulder <am...@alumni.princeton.edu>.
-1 to this change as is: please change the fixed port number to be
a substitution variable, add it to the list in maven.xml, and add it to
one of the installer configuration screens. For example, see
${PlanOpenEJBPort} in j2ee-server-plan.xml, maven.xml, and
izpack-user-input.xml
Thanks,
Aaron
On Wed, 24 Aug 2005 djencks@apache.org wrote:
> Author: djencks
> Date: Wed Aug 24 14:05:38 2005
> New Revision: 239926
>
> URL: http://svn.apache.org/viewcvs?rev=239926&view=rev
> Log:
> Make app client login actually work, and ejb timers actually work
>
> Modified:
> geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml
> geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
> geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml
>
> Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml?rev=239926&r1=239925&r2=239926&view=diff
> ==============================================================================
> --- geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml (original)
> +++ geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml Wed Aug 24 14:05:38 2005
> @@ -36,6 +36,10 @@
> <dependency>
> <uri>geronimo/jars/geronimo-client-${geronimo_version}.jar</uri>
> </dependency>
> + <!-- for property editor support for some login modules/principals -->
> + <dependency>
> + <uri>geronimo/jars/geronimo-common-${geronimo_version}.jar</uri>
> + </dependency>
> <dependency>
> <uri>geronimo/jars/geronimo-naming-${geronimo_version}.jar</uri>
> </dependency>
> @@ -76,7 +80,11 @@
> <dependency>
> <uri>geronimo/jars/geronimo-management-${geronimo_version}.jar</uri>
> </dependency>
> -
> +
> + <!-- remote login -->
> + <dependency>
> + <uri>activeio/jars/activeio-${activeio_version}.jar</uri>
> + </dependency>
> <!--client side web services-->
> <dependency>
> <uri>asm/jars/asm-${asm_version}.jar</uri>
> @@ -109,7 +117,7 @@
> <!--client connector support-->
> <gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
> <attribute name="keepAliveTime">5000</attribute>
> - <attribute name="poolSize">10</attribute>
> + <attribute name="poolSize">100</attribute>
> <attribute name="poolName">DefaultThreadPool</attribute>
> </gbean>
>
> @@ -120,15 +128,21 @@
> <attribute name="syncMaximumPoolSize">10</attribute>
> <attribute name="startMaximumPoolSize">10</attribute>
> <attribute name="scheduledMaximumPoolSize">10</attribute>
> - <reference name="TransactionContextManager"><name>TransactionContextManager</name></reference>
> + <reference name="TransactionContextManager">
> + <name>TransactionContextManager</name>
> + </reference>
> </gbean>
>
> <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.TransactionManagerImplGBean">
> <!--no transaction log on the client-->
> <attribute name="defaultTransactionTimeoutSeconds">600</attribute>
> <references name="ResourceManagers">
> - <pattern><gbean-name>*:j2eeType=JCAManagedConnectionFactory,*</gbean-name></pattern>
> - <pattern><gbean-name>*:j2eeType=ActivationSpec,*</gbean-name></pattern>
> + <pattern>
> + <gbean-name>*:j2eeType=JCAManagedConnectionFactory,*</gbean-name>
> + </pattern>
> + <pattern>
> + <gbean-name>*:j2eeType=ActivationSpec,*</gbean-name>
> + </pattern>
> </references>
> </gbean>
>
>
> Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml?rev=239926&r1=239925&r2=239926&view=diff
> ==============================================================================
> --- geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml (original)
> +++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml Wed Aug 24 14:05:38 2005
> @@ -127,7 +127,11 @@
> <dependency>
> <uri>activemq/jars/activemq-gbean-management-${activemq_version}.jar</uri>
> </dependency>
> -
> + <!-- remote login -->
> + <dependency>
> + <uri>activeio/jars/activeio-${activeio_version}.jar</uri>
> + </dependency>
> +
> ${webcontainer}
>
> <!-- Default security realm using properties files -->
> @@ -182,6 +186,11 @@
> <!-- <attribute name="reclaimPeriod">100000</attribute>-->
> <attribute name="algorithm">HmacSHA1</attribute>
> <attribute name="password">secret</attribute>
> + </gbean>
> +
> + <gbean gbeanName="geronimo.remoting:target=JaasLoginServiceRemotingServer" class="org.apache.geronimo.security.remoting.jmx.JaasLoginServiceRemotingServer">
> + <attribute name="bindURI">tcp://0.0.0.0:4242</attribute>
> + <reference name="LoginService"><name>JaasLoginService</name></reference>
> </gbean>
>
> <gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
>
> Modified: geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml
> URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml?rev=239926&r1=239925&r2=239926&view=diff
> ==============================================================================
> --- geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml (original)
> +++ geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml Wed Aug 24 14:05:38 2005
> @@ -69,7 +69,7 @@
> <attribute name="port">${PlanDerbyPort}</attribute>
> </gbean>
>
> - <gbean name="JDBCTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
> + <gbean name="TransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledTransactionalTimer">
> <attribute name="repeatCount">5</attribute>
> <reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>org/apache/geronimo/Server</module><name>TransactionContextManager</name></reference>
> <reference name="ManagedConnectionFactoryWrapper"><moduleType>JCAResource</moduleType><name>SystemDatasource</name></reference>
> @@ -78,7 +78,7 @@
> <reference name="DerbySystem"><moduleType>J2EEModule</moduleType><name>DerbySystem</name></reference>
> </gbean>
>
> - <gbean name="JDBCNonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
> + <gbean name="NonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
> <reference name="TransactionContextManager"><moduleType>J2EEModule</moduleType><module>org/apache/geronimo/Server</module><name>TransactionContextManager</name></reference>
> <reference name="ManagedConnectionFactoryWrapper"><moduleType>JCAResource</moduleType><name>SystemDatasource</name></reference>
> <reference name="ThreadPool"><moduleType>J2EEModule</moduleType><module>org/apache/geronimo/Server</module><name>DefaultThreadPool</name></reference>
>
>
>