geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject cvs commit: incubator-geronimo/modules/transaction/src/etc/META-INF geronimo-service.xml
Date Sun, 25 Jan 2004 17:55:35 GMT
djencks     2004/01/25 09:55:35

  Modified:    .        maven.xml
               etc      maven.xml
               modules/connector/src/etc/META-INF geronimo-service.xml
               modules/security project.xml
               modules/transaction project.xml
  Added:       modules/security/src/etc/META-INF geronimo-service.xml
               modules/security/src/test-data/data mapping.properties
               modules/transaction/src/etc/META-INF geronimo-service.xml
  Log:
  add dependencies marked with <package>true</package> into package: work on constructing
server
  
  Revision  Changes    Path
  1.57      +7 -6      incubator-geronimo/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/maven.xml,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- maven.xml	24 Jan 2004 19:50:04 -0000	1.56
  +++ maven.xml	25 Jan 2004 17:55:32 -0000	1.57
  @@ -14,12 +14,13 @@
   
       <j:set var="release.id" value="${pom.standardToLegacyId(pom.id)}-${pom.currentVersion}"/>
   
  -    <goal name="deploy:test">
  -        <ant:echo message="in deploy:test"/>
  +    <goal name="deploy:server">
  +        <j:set var="g.repo" value="${maven.repo.local}/geronimo/jars"/>
  +        <ant:echo message="in deploy:server"/>
           <deploy:deploy
  -            deployconfigid="org/apache/geronimo/Default"
  -            deployoutfile="target/Test.car"
  -            deployurl="geronimo-service.xml"/>
  +            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"/>
           <ant:echo message="did deploy:test"/>
       </goal>
       <!-- ======= -->
  
  
  
  1.26      +9 -3      incubator-geronimo/etc/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/etc/maven.xml,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- maven.xml	24 Jan 2004 20:36:52 -0000	1.25
  +++ maven.xml	25 Jan 2004 17:55:35 -0000	1.26
  @@ -8,8 +8,7 @@
       xmlns:ant="jelly:ant"
       xmlns:maven="jelly:maven"
       xmlns:define="jelly:define"
  -    xmlns:xdoclet="common:xdoclet"
  -    xmlns:castor="common:castor">
  +    >
   
       <!-- ================= -->
       <!-- Global Properties -->
  @@ -188,6 +187,13 @@
               <ant:jar destfile="${basedir}/target/${pom.artifactId}-package-${pom.currentVersion}.jar">
                   <fileset dir="${basedir}/target" includes="${pom.artifactId}-${pom.currentVersion}.jar"/>
                   <fileset dir="${basedir}/src/etc" includes="META-INF/geronimo-service.xml"/>
  +                <j:forEach var="artifact" items="${pom.artifacts}">
  +                    <j:set var="dependency" value="${artifact.dependency}"/>
  +                    <j:if test="${dependency.getProperty('package') == 'true'}">
  +                        <ant:echo>Processing dependency: ${dependency.id}</ant:echo>
  +                        <fileset file="${artifact.path}"/>
  +                    </j:if>
  +                </j:forEach>
               </ant:jar>
           </j:if>
       </postGoal>
  
  
  
  1.2       +54 -0     incubator-geronimo/modules/connector/src/etc/META-INF/geronimo-service.xml
  
  Index: geronimo-service.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/connector/src/etc/META-INF/geronimo-service.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- geronimo-service.xml	24 Jan 2004 20:36:52 -0000	1.1
  +++ geronimo-service.xml	25 Jan 2004 17:55:35 -0000	1.2
  @@ -0,0 +1,54 @@
  +<?xml version="1.0" encoding="UTF-8"?>
  +<gbeans>
  +    <path>geronimo-connector-DEV.jar</path>
  +
  +    <!-- connector -->
  +    <gbean class="org.apache.geronimo.connector.work.GeronimoWorkManager" objectName="geronimo.connector:service=WorkManager">
  +        <default attribute="SyncMinimumPoolSize" type="int">0</default>
  +        <default attribute="SyncMaximumPoolSize" type="int">10</default>
  +        <default attribute="StartMinimumPoolSize" type="int">0</default>
  +        <default attribute="StartMaximumPoolSize" type="int">10</default>
  +        <default attribute="ScheduledMinimumPoolSize" type="int">0</default>
  +        <default attribute="ScheduledMaximumPoolSize" type="int">10</default>
  +    </gbean>
  +
  +    <gbean class="org.apache.geronimo.connector.BootstrapContext" objectName="geronimo.connector:role=BootstrapContext">
  +        <endpoint name="WorkManager">
  +            <pattern>geronimo.connector:service=WorkManager</pattern>
  +        </endpoint>
  +        <endpoint name="XATerminator">
  +            <pattern>geronimo.transaction:service=TransactionManager</pattern>
  +        </endpoint>
  +    </gbean>
  +
  +    <gbean class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator"
objectName="geronimo.connector:service=ConnectionTrackingCoordinator"/>
  +
  +    <!-- test to see if ConnectionManagerDeployment actually deploys.  Normally set
up by deployer. -->
  +    <!--gbean class="org.apache.geronimo.connector.outbound.ConnectionManagerDeployment"
objectName="geronimo.management:j2eeType=ConnectionManager,name=test">
  +        <default attribute="UseConnectionRequestInfo" type="boolean">false</default>
  +        <default attribute="UseSubject" type="boolean">false</default>
  +        <default attribute="UseTransactionCaching" type="boolean">true</default>
  +        <default attribute="UseLocalTransactions" type="boolean">true</default>
  +        <default attribute="UseTransactions" type="boolean">true</default>
  +        <default attribute="MaxSize" type="int">10</default>
  +        <default attribute="BlockingTimeout" type="int">1000</default>
  +        <default attribute="Name" type="java.lang.String">test</default>
  +        <endpoint name="RealmBridge">
  +            <pattern>geronimo.security:service=RealmBridge,type=CallerIdentity</pattern>
  +        </endpoint>
  +        <endpoint name="ConnectionTracker">
  +            <pattern>geronimo.connector:service=ConnectionTrackingCoordinator</pattern>
  +        </endpoint>
  +        <endpoint name="Kernel">
  +            <pattern>geronimo.boot:role=Kernel</pattern>
  +        </endpoint>
  +    </gbean-->
  +
  +    <gbean class="org.apache.geronimo.connector.deployment.ConnectorDeployer" objectName="geronimo.deployment:type=connector">
  +        <default attribute="ConnectionTrackerNamePattern" type="javax.management.ObjectName">geronimo.connector:service=ConnectionTrackingCoordinator</default>
  +        <endpoint name="ParserFactory">
  +            <pattern>geronimo.system:type=ParserFactory</pattern>
  +        </endpoint>
  +    </gbean>
  +
  +</gbeans>
  \ No newline at end of file
  
  
  
  1.3       +5 -2      incubator-geronimo/modules/security/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/security/project.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.xml	23 Jan 2004 08:17:48 -0000	1.2
  +++ project.xml	25 Jan 2004 17:55:35 -0000	1.3
  @@ -68,6 +68,7 @@
               <artifactId>geronimo-spec-j2ee-jacc</artifactId>
               <version>DEV</version>
               <properties>
  +                <package>true</package>
                   <module>true</module>
               </properties>
           </dependency>
  @@ -119,10 +120,12 @@
           </dependency>
   
           <dependency>
  -            <id>regexp</id>
  +            <groupId>regexp</groupId>
  +            <artifactId>regexp</artifactId>
               <version>1.3-dev</version>
               <url>http://jakarta.apache.org/regexp</url>
               <properties>
  +                <package>true</package>
                   <runtime>true</runtime>
               </properties>
           </dependency>
  
  
  
  1.1                  incubator-geronimo/modules/security/src/etc/META-INF/geronimo-service.xml
  
  Index: geronimo-service.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <gbeans>
      <path>geronimo-security-DEV.jar</path>
      <path>geronimo-spec-j2ee-jacc-DEV.jar</path>
      <path>regexp-1.3-dev.jar</path>
  
      <!-- security -->
      <gbean class="org.apache.geronimo.security.SecurityService" objectName="geronimo.security:type=SecurityService">
          <default attribute="PolicyConfigurationFactory" type="java.lang.String">org.apache.geronimo.security.jacc.GeronimoPolicyConfigurationFactory</default>
          <endpoint name="Realms">
              <pattern>geronimo.security:type=SecurityRealm,*</pattern>
          </endpoint>
          <endpoint name="ModuleConfigurations">
              <pattern>geronimo.security:type=ModuleConfiguration,*</pattern>
          </endpoint>
      </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:./core/src/test-data/data/users.properties</default>
          <default attribute="GroupsURI" type="java.net.URI">file:./core/src/test-data/data/groups.properties</default>
      </gbean>
  
      <gbean class="org.apache.geronimo.security.bridge.CallerIdentityUserPasswordRealmBridge"
objectName="geronimo.security:service=RealmBridge,type=CallerIdentity">
          <default attribute="TargetRealm" type="java.lang.String">Foo</default>
      </gbean>
  
      <gbean class="org.apache.geronimo.security.bridge.ConfiguredIdentityUserPasswordRealmBridge"
objectName="geronimo.security:service=RealmBridge,type=ConfiguredIdentity">
          <default attribute="TargetRealm" type="java.lang.String">Foo</default>
          <default attribute="ConfiguredUser" type="java.lang.String">user</default>
          <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">
          <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>
          <default attribute="UserNameSourceType" type="java.lang.Class">org.apache.geronimo.security.realm.providers.PropertiesFileUserPrincipal</default>
          <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-->
  
  </gbeans>
  
  
  1.1                  incubator-geronimo/modules/security/src/test-data/data/mapping.properties
  
  Index: mapping.properties
  ===================================================================
  izumi=a:A:pa
  alan=b:B:pb
  george=c:C:pc
  gracie=d:D:pd
  metro=e:E:pe
  
  
  1.4       +3 -1      incubator-geronimo/modules/transaction/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/transaction/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	23 Jan 2004 19:14:12 -0000	1.3
  +++ project.xml	25 Jan 2004 17:55:35 -0000	1.4
  @@ -42,6 +42,7 @@
               <artifactId>geronimo-spec-jta</artifactId>
               <version>DEV</version>
               <properties>
  +                <package>true</package>
                   <module>true</module>
               </properties>
           </dependency>
  @@ -60,6 +61,7 @@
               <artifactId>geronimo-spec-j2ee-connector</artifactId>
               <version>DEV</version>
               <properties>
  +                <package>true</package>
                   <module>true</module>
               </properties>
           </dependency>
  
  
  
  1.1                  incubator-geronimo/modules/transaction/src/etc/META-INF/geronimo-service.xml
  
  Index: geronimo-service.xml
  ===================================================================
  <?xml version="1.0" encoding="UTF-8"?>
  <gbeans>
      <path>geronimo-transaction-DEV.jar</path>
      <path>geronimo-spec-jta-DEV.jar</path>
      <path>geronimo-spec-j2ee-connector-DEV.jar</path>
  
      <!-- transaction -->
      <gbean class="org.apache.geronimo.transaction.TransactionManagerProxy" objectName="geronimo.transaction:service=TransactionManager"/>
  
  </gbeans>
  
  

Mime
View raw message