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 Fri, 06 Feb 2004 08:27:50 GMT
dain        2004/02/06 00:27:50

  Modified:    assembly maven.xml project.xml
               modules/console-web/src/etc/META-INF geronimo-service.xml
               modules/kernel/src/conf log4j.properties
               modules/kernel/src/java/org/apache/geronimo/kernel/config
                        Configuration.java
               modules/security/src/etc/META-INF geronimo-service.xml
  Log:
  Updated assemply to output a cleaner distribution... still needs work
  
  Revision  Changes    Path
  1.4       +40 -91    incubator-geronimo/assembly/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/assembly/maven.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- maven.xml	29 Jan 2004 22:42:46 -0000	1.3
  +++ maven.xml	6 Feb 2004 08:27:49 -0000	1.4
  @@ -41,15 +41,39 @@
       <!-- ==================================================== -->
       <!-- Helper to run Apache Geronimo from the current build -->
       <!-- ==================================================== -->
  -
       <goal name="deploy:server">
  +        <!-- Copy  the runtime dependencies into lib and create a classpath for the
server.jar file -->
  +        <j:set var="libDir" value="target/lib"/>
  +        <ant:mkdir dir="${libDir}"/>
  +        <j:forEach var="artifact" items="${pom.artifacts}">
  +            <j:set var="dependency" value="${artifact.dependency}"/>
  +            <j:if test="${dependency.getProperty('runtime') == 'true'}">
  +                <ant:echo>Processing dependency: ${dependency.id}</ant:echo>
  +                <ant:copy todir="${libDir}" file="${artifact.path}"/>
  +                <j:set var="classpath" value="${classpath} ../lib/${artifact.name}"/>
  +            </j:if>
  +        </j:forEach>
  +        <j:set var="classpath" value="${classpath.trim()}"/>
  +
  +        <!-- Create the server.jar file -->
  +        <ant:mkdir dir="target/bin"/>
  +        <ant:jar destfile="target/bin/server.jar">
  +            <!-- include the log4j.properties file from the kernel module -->
  +            <fileset file="../modules/kernel/src/conf/log4j.properties"/>
  +            <manifest>
  +                <attribute name="Main-Class" value="org.apache.geronimo.Geronimo"/>
  +                <attribute name="Class-Path" value="${classpath}"/>
  +            </manifest>
  +        </ant:jar>
  +
  +        <!-- build the server.car configuration -->
           <j:set var="g.repo" value="${maven.repo.local}/geronimo/jars"/>
  -        <ant:mkdir dir="${basedir}/target"/>
  +        <ant:mkdir dir="${basedir}/target/config"/>
           <ant:echo message="in deploy:server"/>
           <deploy:deploy
               deployconfigid="org/apache/geronimo/Server"
  -            deployoutfile="target/Server.car"
  -            deployurl="${g.repo}/geronimo-security-package-DEV.jar,${g.repo}/geronimo-transaction-package-DEV.jar,${g.repo}/geronimo-connector-package-DEV.jar,${g.repo}/geronimo-jetty-package-DEV.jar,${g.repo}/geronimo-web-console-package-DEV.jar"/>
  +            deployoutfile="target/config/server.car"
  +            deployurl="${g.repo}/geronimo-security-package-DEV.jar,${g.repo}/geronimo-transaction-package-DEV.jar,${g.repo}/geronimo-connector-package-DEV.jar,${g.repo}/geronimo-jetty-package-DEV.jar,${g.repo}/geronimo-web-console-package-DEV.jar,${maven.repo.local}/concurrent/jars/concurrent-1.3.2.jar,${maven.repo.local}/xerces/jars/xercesImpl-2.6.0.jar,${maven.repo.local}/xml-apis/jars/xml-apis-1.0.b2.jar,${maven.repo.local}/xml-commons-resolver/jars/xml-commons-resolver-1.1.jar,${maven.repo.local}/geronimo/jars/geronimo-core-${pom.currentVersion}.jar,${maven.repo.local}/geronimo/jars/geronimo-deployment-${pom.currentVersion}.jar,${maven.repo.local}/geronimo/jars/geronimo-common-${pom.currentVersion}.jar"/>
           <ant:echo message="did deploy:server"/>
       </goal>
   
  @@ -57,8 +81,8 @@
           <ant:echo message="in install:server"/>
           <deploy:install
               installDomain="geronimo"
  -            installStoreDir="target/localConfigStore"
  -            installConfig="target/Server.car"/>
  +            installStoreDir="target/config-store"
  +            installConfig="target/config/server.car"/>
           <ant:echo message="did install:server"/>
       </goal>
   
  @@ -66,7 +90,7 @@
           <ant:echo message="in load:server"/>
           <deploy:loadAndReturn
               runDomain="geronimo"
  -            runStoreDir="target/localConfigStore"
  +            runStoreDir="target/config-store"
               runConfigID="org/apache/geronimo/Server"/>
           <ant:echo message="did load:server"/>
       </goal>
  @@ -75,19 +99,19 @@
           <ant:echo message="in loadAndWait:server"/>
           <deploy:loadAndWait
               runDomain="geronimo"
  -            runStoreDir="target/localConfigStore"
  +            runStoreDir="target/config-store"
               runConfigID="org/apache/geronimo/Server"/>
           <ant:echo message="did loadAndWait:server"/>
       </goal>
   
       <goal name="run:server">
  -        <j:set var="run.dir" value="${basedir}"/>
  +        <j:set var="run.dir" value="${basedir}/target/bin"/>
           <ant:echo message="Running in ${run.dir}"/>
   
           <j:jelly xmlns="jelly:ant">
   
               <property environment="env"/>
  -            <java classname="org.apache.geronimo.Geronimo"
  +            <java jar="target/bin/server.jar"
                   fork="true"
                   maxmemory="256m"
                   failonerror="true"
  @@ -95,45 +119,7 @@
   
                   <jvmarg value="-ea"/>
   
  -                <classpath>
  -                    <pathelement path="${env.JAVA_HOME}/lib/tools.jar"/>
  -                    <!--pathelement path="${run.dir}/etc"/-->
  -                    <fileset dir="${maven.repo.local}/cglib/jars">
  -                        <include name="cglib-full-2.0-RC2.jar"/>
  -                    </fileset>
  -                    <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>
  -                    <fileset dir="${maven.repo.local}/mx4j/jars">
  -                        <include name="mx4j-SNAPSHOT.jar"/>
  -                    </fileset>
  -                    <fileset dir="${maven.repo.local}/xerces/jars">
  -                        <include name="xercesImpl-2.6.0.jar"/>
  -                    </fileset>
  -                    <fileset dir="${maven.repo.local}/xml-apis/jars">
  -                        <include name="xml-apis-1.0.b2.jar"/>
  -                    </fileset>
  -                    <fileset dir="${maven.repo.local}/xml-commons-resolver/jars">
  -                        <include name="xml-commons-resolver-1.1.jar"/>
  -                    </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>
  -                </classpath>
  -
  -                <!--sysproperty key="program.name" value="maven:run"/>
  -                <sysproperty key="java.rmi.server.RMIClassLoaderSpi" value="org.apache.geronimo.rmi.RMIClassLoaderSpiImpl"/-->
  -
  -                <arg value="target/localConfigStore"/>
  +                <arg value="../config-store"/>
                   <arg value="org/apache/geronimo/Server"/>
               </java>
           </j:jelly>
  @@ -146,58 +132,21 @@
           <j:jelly xmlns="jelly:ant">
   
               <property environment="env"/>
  -            <java classname="org.apache.geronimo.Geronimo"
  +            <java jar="target/bin/server.jar"
                   fork="true"
                   maxmemory="256m"
                   failonerror="true"
                   dir="${run.dir}">
   
                   <jvmarg value="-ea"/>
  -
  -                <classpath>
  -                    <pathelement path="${env.JAVA_HOME}/lib/tools.jar"/>
  -                    <!--pathelement path="${run.dir}/etc"/-->
  -                    <fileset dir="${maven.repo.local}/cglib/jars">
  -                        <include name="cglib-full-2.0-RC2.jar"/>
  -                    </fileset>
  -                    <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>
  -                    <fileset dir="${maven.repo.local}/mx4j/jars">
  -                        <include name="mx4j-SNAPSHOT.jar"/>
  -                    </fileset>
  -                    <fileset dir="${maven.repo.local}/xerces/jars">
  -                        <include name="xercesImpl-2.6.0.jar"/>
  -                    </fileset>
  -                    <fileset dir="${maven.repo.local}/xml-apis/jars">
  -                        <include name="xml-apis-1.0.b2.jar"/>
  -                    </fileset>
  -                    <fileset dir="${maven.repo.local}/xml-commons-resolver/jars">
  -                        <include name="xml-commons-resolver-1.1.jar"/>
  -                    </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>
  -                </classpath>
  -
                   <jvmarg value="-Xdebug"/>
                   <jvmarg value="-Xnoagent"/>
  -                <jvmarg value="-Xrunjdwp:transport=dt_socket,address=80000,server=y,suspend=y"/>
  +                <jvmarg value="-Djava.compiler=NONE"/>
  +                <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8888,server=y,suspend=n"/>
   
                   <sysproperty key="java.compiler" value="NONE"/>
  -                <!--sysproperty key="program.name" value="maven:run"/>
  -                <sysproperty key="java.rmi.server.RMIClassLoaderSpi" value="org.apache.geronimo.rmi.RMIClassLoaderSpiImpl"/-->
   
  -                <arg value="target/localConfigStore"/>
  +                <arg value="target/config-store"/>
                   <arg value="org/apache/geronimo/Server"/>
               </java>
           </j:jelly>
  
  
  
  1.2       +11 -91    incubator-geronimo/assembly/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/assembly/project.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- project.xml	29 Jan 2004 05:17:25 -0000	1.1
  +++ project.xml	6 Feb 2004 08:27:49 -0000	1.2
  @@ -18,7 +18,6 @@
       <siteDirectory>/www/incubator.apache.org/projects/geronimo</siteDirectory>
       <distributionDirectory>/www/incubator.apache.org/projects/geronimo/builds</distributionDirectory>
   
  -    <!--package>org.apache.geronimo.connector</package-->
       <currentVersion>DEV</currentVersion>
   
       <!-- ============ -->
  @@ -26,94 +25,23 @@
       <!-- ============ -->
   
       <dependencies>
  -
  -        <dependency>
  -            <groupId>geronimo</groupId>
  -            <artifactId>geronimo-common</artifactId>
  -            <version>DEV</version>
  -            <properties>
  -                <module>true</module>
  -            </properties>
  -        </dependency>
  -
  -        <dependency>
  -            <groupId>geronimo</groupId>
  -            <artifactId>geronimo-core</artifactId>
  -            <version>DEV</version>
  -            <properties>
  -                <module>true</module>
  -            </properties>
  -        </dependency>
  -
  -        <dependency>
  -            <groupId>geronimo</groupId>
  -            <artifactId>geronimo-deployment</artifactId>
  -            <version>DEV</version>
  -            <properties>
  -                <module>true</module>
  -            </properties>
  -        </dependency>
  -
           <dependency>
               <groupId>geronimo</groupId>
               <artifactId>geronimo-kernel</artifactId>
               <version>DEV</version>
               <properties>
  +                <runtime>true</runtime>
                   <module>true</module>
               </properties>
           </dependency>
   
           <dependency>
  -            <groupId>geronimo</groupId>
  -            <artifactId>geronimo-security</artifactId>
  -            <version>DEV</version>
  -            <properties>
  -                <module>true</module>
  -            </properties>
  -        </dependency>
  -
  -        <dependency>
  -            <groupId>geronimo</groupId>
  -            <artifactId>geronimo-transaction</artifactId>
  -            <version>DEV</version>
  -            <properties>
  -                <module>true</module>
  -            </properties>
  -        </dependency>
  -
  -        <dependency>
  -            <groupId>geronimo-spec</groupId>
  -            <artifactId>geronimo-spec-j2ee-jacc</artifactId>
  -            <version>DEV</version>
  -            <properties>
  -                <module>true</module>
  -            </properties>
  -        </dependency>
  -
  -        <dependency>
  -            <groupId>geronimo-spec</groupId>
  -            <artifactId>geronimo-spec-j2ee-connector</artifactId>
  -            <version>DEV</version>
  -            <properties>
  -                <module>true</module>
  -            </properties>
  -        </dependency>
  -
  -        <dependency>
  -            <groupId>geronimo-spec</groupId>
  -            <artifactId>geronimo-spec-j2ee-deployment</artifactId>
  -            <version>DEV</version>
  -            <properties>
  -                <module>true</module>
  -            </properties>
  -        </dependency>
  -
  -        <dependency>
  -            <groupId>geronimo-spec</groupId>
  -            <artifactId>geronimo-spec-jta</artifactId>
  -            <version>DEV</version>
  +            <groupId>cglib</groupId>
  +            <artifactId>cglib-full</artifactId>
  +            <version>2.0-RC2</version>
  +            <url>http://cglib.sf.net/</url>
               <properties>
  -                <module>true</module>
  +                <runtime>true</runtime>
               </properties>
           </dependency>
   
  @@ -122,13 +50,14 @@
               <version>1.0.3</version>
               <url>http://jakarta.apache.org/commons/logging/</url>
               <properties>
  -                <runtime>false</runtime>
  +                <runtime>true</runtime>
               </properties>
           </dependency>
   
           <dependency>
  -            <id>concurrent</id>
  -            <version>1.3.2</version>
  +            <id>log4j</id>
  +            <version>1.2.8</version>
  +            <url>http://jakarta.apache.org/log4j</url>
               <properties>
                   <runtime>true</runtime>
               </properties>
  @@ -137,15 +66,6 @@
           <dependency>
               <id>mx4j</id>
               <version>SNAPSHOT</version>
  -            <properties>
  -                <runtime>false</runtime>
  -            </properties>
  -        </dependency>
  -
  -        <dependency>
  -            <id>regexp</id>
  -            <version>1.3-dev</version>
  -            <url>http://jakarta.apache.org/regexp</url>
               <properties>
                   <runtime>true</runtime>
               </properties>
  
  
  
  1.3       +1 -1      incubator-geronimo/modules/console-web/src/etc/META-INF/geronimo-service.xml
  
  Index: geronimo-service.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/console-web/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	29 Jan 2004 23:33:17 -0000	1.2
  +++ geronimo-service.xml	6 Feb 2004 08:27:49 -0000	1.3
  @@ -3,7 +3,7 @@
   <!--    <path>geronimo-web-console.war</path>-->
   
       <gbean class="org.apache.geronimo.jetty.JettyWebApplicationContext" objectName="geronimo.app:name=WebConsole">
  -        <default attribute="URI" type="java.net.URI">file:../modules/console-web/target/geronimo-web-console/</default>
  +        <default attribute="URI" type="java.net.URI">file:../../../modules/console-web/target/geronimo-web-console/</default>
           <default attribute="ContextPath" type="java.lang.String">/geronimo-web-console</default>
           <endpoint name="JettyContainer">
               <pattern>geronimo.web:type=WebContainer,container=Jetty</pattern>
  
  
  
  1.3       +3 -3      incubator-geronimo/modules/kernel/src/conf/log4j.properties
  
  Index: log4j.properties
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/conf/log4j.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- log4j.properties	6 Nov 2003 20:56:31 -0000	1.2
  +++ log4j.properties	6 Feb 2004 08:27:49 -0000	1.3
  @@ -7,8 +7,8 @@
   log4j.rootCategory=TRACE#org.apache.geronimo.kernel.log.XLevel, CONSOLE
   
   log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
  -log4j.appender.CONSOLE.Threshold=TRACE#org.apache.geronimo.kernel.log.XLevel
  -#log4j.appender.CONSOLE.Threshold=DEBUG
  +#log4j.appender.CONSOLE.Threshold=TRACE#org.apache.geronimo.kernel.log.XLevel
  +log4j.appender.CONSOLE.Threshold=INFO
   log4j.appender.CONSOLE.Target=System.out
   log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
   log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
  
  
  
  1.8       +16 -13    incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java
  
  Index: Configuration.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/kernel/src/java/org/apache/geronimo/kernel/config/Configuration.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Configuration.java	25 Jan 2004 21:07:04 -0000	1.7
  +++ Configuration.java	6 Feb 2004 08:27:49 -0000	1.8
  @@ -154,14 +154,14 @@
       }
   
       public void setGBeanContext(GBeanContext context) {
  -        this.context = (GBeanMBeanContext)context;
  +        this.context = (GBeanMBeanContext) context;
       }
   
       public void doStart() throws Exception {
           // build classpath
           URL[] urls = new URL[classPath.size()];
           for (int i = 0; i < urls.length; i++) {
  -            URI path =  (URI) classPath.get(i);
  +            URI path = (URI) classPath.get(i);
               urls[i] = new URL(baseURL, path.toString());
           }
           if (parent == null) {
  @@ -180,7 +180,7 @@
               GBeanMBean gbean = (GBeanMBean) entry.getValue();
               MBeanServer mbServer = context.getServer();
               mbServer.registerMBean(gbean, name);
  -            mbServer.invoke(Kernel.DEPENDENCY_SERVICE, "addDependency", new Object[] {
name, context.getObjectName()}, new String[] {ObjectName.class.getName(), ObjectName.class.getName()});
  +            mbServer.invoke(Kernel.DEPENDENCY_SERVICE, "addDependency", new Object[]{name,
context.getObjectName()}, new String[]{ObjectName.class.getName(), ObjectName.class.getName()});
           }
       }
   
  @@ -190,16 +190,16 @@
           for (Iterator i = gbeans.keySet().iterator(); i.hasNext();) {
               ObjectName name = (ObjectName) i.next();
               try {
  -                mbServer.invoke(Kernel.DEPENDENCY_SERVICE, "removeDependency", new Object[]
{ name, context.getObjectName()}, new String[] {ObjectName.class.getName(), ObjectName.class.getName()});
  +                mbServer.invoke(Kernel.DEPENDENCY_SERVICE, "removeDependency", new Object[]{name,
context.getObjectName()}, new String[]{ObjectName.class.getName(), ObjectName.class.getName()});
               } catch (Exception e) {
                   // ignore
  -                log.warn("Could not remove dependency for child "+name, e);
  +                log.warn("Could not remove dependency for child " + name, e);
               }
               try {
                   mbServer.unregisterMBean(name);
               } catch (Exception e) {
                   // ignore
  -                log.warn("Could not unregister child "+name, e);
  +                log.warn("Could not unregister child " + name, e);
               }
           }
   
  @@ -274,11 +274,13 @@
        */
       public static Map loadGBeans(byte[] gbeanState, ClassLoader cl) throws InvalidConfigException
{
           Map gbeans = new HashMap();
  +        ObjectName objectName = null;
           try {
               ObjectInputStream ois = new ConfigInputStream(new ByteArrayInputStream(gbeanState),
cl);
               try {
                   while (true) {
  -                    ObjectName objectName = (ObjectName) ois.readObject();
  +                    objectName = null;
  +                    objectName = (ObjectName) ois.readObject();
                       GBeanInfo info = (GBeanInfo) ois.readObject();
                       GBeanMBean gbean = new GBeanMBean(info, cl);
                       loadGMBeanState(gbean, ois);
  @@ -291,18 +293,19 @@
               }
               return gbeans;
           } catch (Exception e) {
  -            throw new InvalidConfigException("Unable to deserialize GBeanState", e);
  +            throw new InvalidConfigException("Unable to deserialize GBeanState" +
  +                    (objectName == null ? "" : " " + objectName), e);
           }
       }
   
       public static void loadGMBeanState(GBeanMBean gbean, ObjectInputStream ois) throws
IOException, AttributeNotFoundException, InvalidAttributeValueException, MBeanException, ReflectionException,
ClassNotFoundException {
           int attributeCount = ois.readInt();
  -        for (int i = 0; i < attributeCount; i ++) {
  -            gbean.setAttribute((String)ois.readObject(), ois.readObject());
  +        for (int i = 0; i < attributeCount; i++) {
  +            gbean.setAttribute((String) ois.readObject(), ois.readObject());
           }
           int endpointCount = ois.readInt();
  -        for (int i = 0; i < endpointCount; i ++) {
  -            gbean.setReferencePatterns((String)ois.readObject(), (Set)ois.readObject());
  +        for (int i = 0; i < endpointCount; i++) {
  +            gbean.setReferencePatterns((String) ois.readObject(), (Set) ois.readObject());
           }
       }
   
  
  
  
  1.4       +4 -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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- geronimo-service.xml	29 Jan 2004 14:00:12 -0000	1.3
  +++ geronimo-service.xml	6 Feb 2004 08:27:50 -0000	1.4
  @@ -16,6 +16,7 @@
       </gbean>
   
       <!-- 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>
  @@ -32,7 +33,7 @@
           <default attribute="ConfiguredPassword" type="java.lang.String">password</default>
       </gbean>
   
  -    <!--gbean class="org.apache.geronimo.security.bridge.PropertiesFilePrincipalMappingUserPasswordRealmBridge"
objectName="geronimo.security:service=RealmBridge,type=MappedIdentity">
  +    <gbean class="org.apache.geronimo.security.bridge.PropertiesFilePrincipalMappingUserPasswordRealmBridge"
objectName="geronimo.security:service=RealmBridge,type=MappedIdentity">
           <default attribute="TargetRealm" type="java.lang.String">Foo</default>
           <default attribute="PrincipalSourceType" type="java.lang.Class">org.apache.geronimo.security.realm.providers.PropertiesFileUserPrincipal</default>
           <default attribute="PrincipalTargetCallbackName" type="java.lang.String">user
name</default>
  @@ -40,6 +41,7 @@
           <default attribute="UserNameTargetCallbackName" type="java.lang.String">user
name</default>
           <default attribute="PasswordSourceType" type="java.lang.Class">org.apache.geronimo.security.realm.providers.PropertiesFileUserPrincipal</default>
           <default attribute="PropertyFileURL" type="java.net.URL">file:./core/src/test-data/data/mapping.properties</default>
  -    </gbean-->
  +    </gbean>
  +-->
   
   </gbeans>
  
  
  

Mime
View raw message