geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r165045 - in /geronimo/trunk/modules/assembly: maven.xml src/plan/j2ee-secure-plan.xml
Date Wed, 27 Apr 2005 20:43:58 GMT
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>



Mime
View raw message