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/04/27 22:43:58 UTC
svn commit: r165045 - in /geronimo/trunk/modules/assembly: maven.xml
src/plan/j2ee-secure-plan.xml
Author: djencks
Date: Wed Apr 27 13:43:57 2005
New Revision: 165045
URL: http://svn.apache.org/viewcvs?rev=165045&view=rev
Log:
repair security demo
Modified:
geronimo/trunk/modules/assembly/maven.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml
Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=165045&r1=165044&r2=165045&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Wed Apr 27 13:43:57 2005
@@ -258,7 +258,7 @@
<ant:jvmarg value="-Djava.compiler=NONE"/>
<ant:jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>
-->
-
+
<!-- build the J2EEServer configuration -->
<ant:echo>Building server configuration</ant:echo>
<ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
@@ -420,12 +420,16 @@
<ant:copy todir="${distDir}/var/catalina/conf" file="${project.root}/modules/tomcat/src/var/web.xml"/>
<!-- build the Demo configuration -->
- <!-- <ant:echo>Building demo website configuration</ant:echo>-->
- <!-- <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">-->
- <!-- <ant:jvmarg value="-ea"/>-->
- <!-- <ant:arg value="distribute"/>-->
- <!-- <ant:arg value="${maven.repo.local}/geronimo/wars/geronimo-demo-${pom.currentVersion}.war"/>-->
- <!-- </ant:java>-->
+ <ant:echo>Building demo website configuration</ant:echo>
+ <ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
+ <ant:jvmarg value="-ea"/>
+ <ant:arg value="--user"/>
+ <ant:arg value="system"/>
+ <ant:arg value="--password"/>
+ <ant:arg value="manager"/>
+ <ant:arg value="distribute"/>
+ <ant:arg value="${maven.repo.local}/geronimo/wars/geronimo-demo-${pom.currentVersion}.war"/>
+ </ant:java>
<!-- build the Debug Tool configuration "org/apache/geronimo/DebugConsole"-->
<ant:echo>Building debug tool configuration</ant:echo>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml?rev=165045&r1=165044&r2=165045&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml Wed Apr 27 13:43:57 2005
@@ -32,7 +32,7 @@
<!-- Security GBeans -->
- <gbean gbeanName="geronimo.security:type=LoginModule,name=demo-properties-login"
+ <gbean name="demo-properties-login"
class="org.apache.geronimo.security.jaas.LoginModuleGBean">
<attribute name="loginModuleClass">org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</attribute>
<attribute name="serverSide">true</attribute>
@@ -43,7 +43,7 @@
<attribute name="loginDomainName">demo-properties-realm</attribute>
</gbean>
- <gbean gbeanName="geronimo.security:type=SecurityRealm,name=demo-properties-realm"
+ <gbean name="demo-properties-realm"
class="org.apache.geronimo.security.realm.GenericSecurityRealm">
<attribute name="realmName">demo-properties-realm</attribute>
<attribute name="loginModuleConfiguration">
@@ -52,7 +52,7 @@
<reference name="ServerInfo"><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
</gbean>
- <gbean gbeanName="geronimo.security:type=ConfigurationEntry,jaasId=jaasTest"
+ <gbean name="jaasTest"
class="org.apache.geronimo.security.jaas.ServerRealmConfigurationEntry">
<attribute name="applicationConfigName">jaasTest</attribute>
<attribute name="realmName">demo-properties-realm</attribute>
Re: svn commit: r165045 - in /geronimo/trunk/modules/assembly: maven.xml
src/plan/j2ee-secure-plan.xml
Posted by si...@insession.com.
I didn't see any mails on the dev list that showed the errors that Katia
encountered in relation to this fix... Could this fix be related to
http://issues.apache.org/jira/browse/GERONIMO-604 ?
John
This e-mail message and any attachments may contain confidential,
proprietary or non-public information. This information is intended
solely for the designated recipient(s). If an addressing or transmission
error has misdirected this e-mail, please notify the sender immediately
and destroy this e-mail. Any review, dissemination, use or reliance upon
this information by unintended recipients is prohibited. Any opinions
expressed in this e-mail are those of the author personally.
djencks@apache.org
28-Apr-2005 06:43 AM
Please respond to
dev@geronimo.apache.org
To
scm@geronimo.apache.org
cc
Subject
svn commit: r165045 - in /geronimo/trunk/modules/assembly: maven.xml
src/plan/j2ee-secure-plan.xml
Author: djencks
Date: Wed Apr 27 13:43:57 2005
New Revision: 165045
URL: http://svn.apache.org/viewcvs?rev=165045&view=rev
Log:
repair security demo
Modified:
geronimo/trunk/modules/assembly/maven.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml
Modified: geronimo/trunk/modules/assembly/maven.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=165045&r1=165044&r2=165045&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Wed Apr 27 13:43:57 2005
@@ -258,7 +258,7 @@
<ant:jvmarg value="-Djava.compiler=NONE"/>
<ant:jvmarg
value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>
-->
-
+
<!-- build the J2EEServer configuration -->
<ant:echo>Building server configuration</ant:echo>
<ant:java fork="true" jar="${distDir}/bin/deployer.jar"
failonerror="true">
@@ -420,12 +420,16 @@
<ant:copy todir="${distDir}/var/catalina/conf"
file="${project.root}/modules/tomcat/src/var/web.xml"/>
<!-- build the Demo configuration -->
- <!-- <ant:echo>Building demo website
configuration</ant:echo>-->
- <!-- <ant:java fork="true"
jar="${distDir}/bin/deployer.jar" failonerror="true">-->
- <!-- <ant:jvmarg value="-ea"/>-->
- <!-- <ant:arg value="distribute"/>-->
- <!-- <ant:arg
value="${maven.repo.local}/geronimo/wars/geronimo-demo-${pom.currentVersion}.war"/>-->
- <!-- </ant:java>-->
+ <ant:echo>Building demo website configuration</ant:echo>
+ <ant:java fork="true" jar="${distDir}/bin/deployer.jar"
failonerror="true">
+ <ant:jvmarg value="-ea"/>
+ <ant:arg value="--user"/>
+ <ant:arg value="system"/>
+ <ant:arg value="--password"/>
+ <ant:arg value="manager"/>
+ <ant:arg value="distribute"/>
+ <ant:arg
value="${maven.repo.local}/geronimo/wars/geronimo-demo-${pom.currentVersion}.war"/>
+ </ant:java>
<!-- build the Debug Tool configuration
"org/apache/geronimo/DebugConsole"-->
<ant:echo>Building debug tool configuration</ant:echo>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml
URL:
http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml?rev=165045&r1=165044&r2=165045&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml
(original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml Wed Apr
27 13:43:57 2005
@@ -32,7 +32,7 @@
<!-- Security GBeans -->
- <gbean
gbeanName="geronimo.security:type=LoginModule,name=demo-properties-login"
+ <gbean name="demo-properties-login"
class="org.apache.geronimo.security.jaas.LoginModuleGBean">
<attribute
name="loginModuleClass">org.apache.geronimo.security.realm.providers.PropertiesFileLoginModule</attribute>
<attribute name="serverSide">true</attribute>
@@ -43,7 +43,7 @@
<attribute
name="loginDomainName">demo-properties-realm</attribute>
</gbean>
- <gbean
gbeanName="geronimo.security:type=SecurityRealm,name=demo-properties-realm"
+ <gbean name="demo-properties-realm"
class="org.apache.geronimo.security.realm.GenericSecurityRealm">
<attribute name="realmName">demo-properties-realm</attribute>
<attribute name="loginModuleConfiguration">
@@ -52,7 +52,7 @@
<reference
name="ServerInfo"><module>org/apache/geronimo/System</module><name>ServerInfo</name></reference>
</gbean>
- <gbean
gbeanName="geronimo.security:type=ConfigurationEntry,jaasId=jaasTest"
+ <gbean name="jaasTest"
class="org.apache.geronimo.security.jaas.ServerRealmConfigurationEntry">
<attribute name="applicationConfigName">jaasTest</attribute>
<attribute name="realmName">demo-properties-realm</attribute>