geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: incubator-geronimo/modules/security/src/etc/META-INF geronimo-service.xml
Date Thu, 29 Jan 2004 14:00:12 GMT
dims        2004/01/29 06:00:12

  Modified:    assembly maven.xml
               modules/jetty/src/etc/META-INF geronimo-service.xml
               modules/kernel/src/java/org/apache/geronimo Geronimo.java
               modules/security/src/deploy security-service.xml
               modules/security/src/etc/META-INF geronimo-service.xml
  Log:
  - Get "maven deployinstallrun" working (from assembly directory)
  - Fix relative paths for users.properties, groups.properties, geronimo-web-console.war
  - Added concurrent jar and geronimo-core jar to maven.xml
  - Added "startRecursive" call in o.a.g.Geronimo to start all the deployed services (inluding
jetty and webconsole)
  
  Revision  Changes    Path
  1.2       +12 -1     incubator-geronimo/assembly/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/assembly/maven.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- maven.xml	29 Jan 2004 05:17:25 -0000	1.1
  +++ maven.xml	29 Jan 2004 14:00:12 -0000	1.2
  @@ -82,6 +82,7 @@
   
       <goal name="run:server">
           <j:set var="run.dir" value="${basedir}"/>
  +        <ant:echo message="Running in ${run.dir}"/>
   
           <j:jelly xmlns="jelly:ant">
   
  @@ -103,6 +104,9 @@
                       <fileset dir="${maven.repo.local}/commons-logging/jars">
                           <include name="commons-logging-1.0.3.jar"/>
                       </fileset>
  +                    <fileset dir="${maven.repo.local}/concurrent/jars">
  +                        <include name="concurrent-1.3.2.jar"/>
  +                    </fileset>
                       <fileset dir="${maven.repo.local}/log4j/jars">
                           <include name="log4j-1.2.8.jar"/>
                       </fileset>
  @@ -120,6 +124,7 @@
                       </fileset>
                       <fileset dir="${maven.repo.local}/geronimo/jars">
                           <include name="geronimo-kernel-${pom.currentVersion}.jar"/>
  +                        <include name="geronimo-core-${pom.currentVersion}.jar"/>
                           <include name="geronimo-deployment-${pom.currentVersion}.jar"/>
                           <include name="geronimo-common-${pom.currentVersion}.jar"/>
                       </fileset>
  @@ -136,6 +141,8 @@
   
       <goal name="debug:server">
           <j:set var="run.dir" value="${basedir}"/>
  +        <ant:echo message="Running in ${run.dir}"/>
  +
           <j:jelly xmlns="jelly:ant">
   
               <property environment="env"/>
  @@ -156,6 +163,9 @@
                       <fileset dir="${maven.repo.local}/commons-logging/jars">
                           <include name="commons-logging-1.0.3.jar"/>
                       </fileset>
  +                    <fileset dir="${maven.repo.local}/concurrent/jars">
  +                        <include name="concurrent-1.3.2.jar"/>
  +                    </fileset>
                       <fileset dir="${maven.repo.local}/log4j/jars">
                           <include name="log4j-1.2.8.jar"/>
                       </fileset>
  @@ -173,6 +183,7 @@
                       </fileset>
                       <fileset dir="${maven.repo.local}/geronimo/jars">
                           <include name="geronimo-kernel-${pom.currentVersion}.jar"/>
  +                        <include name="geronimo-core-${pom.currentVersion}.jar"/>
                           <include name="geronimo-deployment-${pom.currentVersion}.jar"/>
                           <include name="geronimo-common-${pom.currentVersion}.jar"/>
                       </fileset>
  
  
  
  1.4       +1 -1      incubator-geronimo/modules/jetty/src/etc/META-INF/geronimo-service.xml
  
  Index: geronimo-service.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/jetty/src/etc/META-INF/geronimo-service.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- geronimo-service.xml	28 Jan 2004 23:02:07 -0000	1.3
  +++ geronimo-service.xml	29 Jan 2004 14:00:12 -0000	1.4
  @@ -19,7 +19,7 @@
   <!--        <default attribute="MaxIdleTime" type="int">10</default>-->
       </gbean>
       <gbean class="org.apache.geronimo.jetty.JettyWebApplicationContext" objectName="geronimo.app:name=WebConsole">
  -        <default attribute="URI" type="java.net.URI">file:./deploy/jetty/geronimo-web-console.war</default>
  +        <default attribute="URI" type="java.net.URI">file:../modules/console-web/target/geronimo-web-console.war</default>
           <default attribute="ContextPath" type="java.lang.String">/geronimo-web-console</default>
           <endpoint name="JettyContainer">
               <pattern>geronimo.web:type=WebContainer,container=Jetty</pattern>
  
  
  
  1.5       +4 -2      incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/Geronimo.java
  
  Index: Geronimo.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/Geronimo.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Geronimo.java	28 Jan 2004 23:03:22 -0000	1.4
  +++ Geronimo.java	29 Jan 2004 14:00:12 -0000	1.5
  @@ -56,6 +56,7 @@
   
   package org.apache.geronimo;
   
  +import javax.management.ObjectName;
   import java.net.URI;
   import java.net.URISyntaxException;
   import java.net.URL;
  @@ -86,7 +87,7 @@
        * invoked or until the JVM exits.
        * @param args
        */
  -    public static void main(String[] args) {
  +    public static void main(String[] args) throws Exception {
           if (args.length < 2) {
               System.err.println("usage: " + Geronimo.class.getName() + " <config-store-dir>
<config-id>");
               System.exit(1);
  @@ -118,6 +119,7 @@
               e.printStackTrace();
               System.exit(3);
           }
  +        kernel.getMBeanServer().invoke(new ObjectName("geronimo.config:name=" + ObjectName.quote(args[1])),
"startRecursive", null, null);
           while (kernel.isRunning()) {
               try {
                   synchronized (kernel) {
  
  
  
  1.2       +2 -2      incubator-geronimo/modules/security/src/deploy/security-service.xml
  
  Index: security-service.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/security/src/deploy/security-service.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- security-service.xml	23 Jan 2004 06:47:06 -0000	1.1
  +++ security-service.xml	29 Jan 2004 14:00:12 -0000	1.2
  @@ -9,8 +9,8 @@
   
       <mbean descriptor="org.apache.geronimo.security.realm.providers.PropertiesFileSecurityRealm"
name="geronimo.security:type=SecurityRealm">
           <attribute name="RealmName">Foo</attribute>
  -        <attribute name="UsersURI">../../../modules/core/src/test-data/data/users.properties</attribute>
  -        <attribute name="GroupsURI">../../../modules/core/src/test-data/data/groups.properties</attribute>
  +        <attribute name="UsersURI">../modules/core/src/test-data/data/users.properties</attribute>
  +        <attribute name="GroupsURI">../modules/core/src/test-data/data/groups.properties</attribute>
           <depends name="geronimo.security:type=SecurityService"/>
       </mbean>
   </components>
  
  
  
  1.3       +2 -2      incubator-geronimo/modules/security/src/etc/META-INF/geronimo-service.xml
  
  Index: geronimo-service.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/security/src/etc/META-INF/geronimo-service.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- geronimo-service.xml	28 Jan 2004 10:45:50 -0000	1.2
  +++ geronimo-service.xml	29 Jan 2004 14:00:12 -0000	1.3
  @@ -18,8 +18,8 @@
       <!-- the rest of these are actually examples that should be set up by the security
management tool-->
       <gbean class="org.apache.geronimo.security.realm.providers.PropertiesFileSecurityRealm"
objectName="geronimo.security:type=SecurityRealm,name=Foo">
           <default attribute="RealmName" type="java.lang.String">Foo</default>
  -        <default attribute="UsersURI" type="java.net.URI">file:../../modules/security/src/test-data/data/users.properties</default>
  -        <default attribute="GroupsURI" type="java.net.URI">file:../../modules/security/src/test-data/data/groups.properties</default>
  +        <default attribute="UsersURI" type="java.net.URI">file:../modules/security/src/test-data/data/users.properties</default>
  +        <default attribute="GroupsURI" type="java.net.URI">file:../modules/security/src/test-data/data/groups.properties</default>
       </gbean>
   
       <gbean class="org.apache.geronimo.security.bridge.CallerIdentityUserPasswordRealmBridge"
objectName="geronimo.security:service=RealmBridge,type=CallerIdentity">
  
  
  

Mime
View raw message