geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jboy...@apache.org
Subject cvs commit: incubator-geronimo/modules/core/src/conf jsr88-product-provider-manifest.mf
Date Fri, 22 Aug 2003 19:16:34 GMT
jboynes     2003/08/22 12:16:34

  Modified:    modules/core/src/java/org/apache/geronimo/enterprise/deploy/provider
                        GeronimoDeploymentManager.java
                        NoServerConnection.java ServerConnection.java
               modules/core maven.xml
               modules/core/src/conf jsr88-product-provider-manifest.mf
  Log:
  More DConfigBean changes from Aaron Mulder
  
  Revision  Changes    Path
  1.3       +6 -5      incubator-geronimo/modules/core/src/java/org/apache/geronimo/enterprise/deploy/provider/GeronimoDeploymentManager.java
  
  Index: GeronimoDeploymentManager.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/enterprise/deploy/provider/GeronimoDeploymentManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- GeronimoDeploymentManager.java	22 Aug 2003 19:03:37 -0000	1.2
  +++ GeronimoDeploymentManager.java	22 Aug 2003 19:16:34 -0000	1.3
  @@ -69,6 +69,7 @@
   import javax.enterprise.deploy.shared.ModuleType;
   import javax.enterprise.deploy.shared.DConfigBeanVersionType;
   import javax.enterprise.deploy.model.DeployableObject;
  +
   import org.apache.geronimo.enterprise.deploy.provider.jar.EjbJarRoot;
   
   /**
  @@ -86,10 +87,10 @@
       }
   
       public DeploymentConfiguration createConfiguration(DeployableObject dObj) throws InvalidModuleException
{
  -        if(dObj.getType().getValue() == ModuleType.EJB.getValue()) {
  +        if (dObj.getType().getValue() == ModuleType.EJB.getValue()) {
               return new EjbJarDeploymentConfiguration(dObj, new EjbJarRoot(dObj.getDDBeanRoot()));
           } else {
  -            throw new InvalidModuleException("Can't handle modules of type "+dObj.getType());
  +            throw new InvalidModuleException("Can't handle modules of type " + dObj.getType());
           }
       }
   
  @@ -123,7 +124,7 @@
        *         not the default locale, as changing Locales is not supported.
        */
       public void setLocale(Locale locale) throws UnsupportedOperationException {
  -        if(!locale.equals(Locale.getDefault())) {
  +        if (!locale.equals(Locale.getDefault())) {
               throw new UnsupportedOperationException();
           }
       }
  @@ -163,7 +164,7 @@
        *         version is not 1.4.
        */
       public void setDConfigBeanVersion(DConfigBeanVersionType version) throws DConfigBeanVersionUnsupportedException
{
  -        if(version.getValue() != DConfigBeanVersionType.V1_4.getValue()) {
  +        if (version.getValue() != DConfigBeanVersionType.V1_4.getValue()) {
               throw new DConfigBeanVersionUnsupportedException("This implementation only
supports J2EE 1.4");
           }
       }
  
  
  
  1.2       +15 -1     incubator-geronimo/modules/core/src/java/org/apache/geronimo/enterprise/deploy/provider/NoServerConnection.java
  
  Index: NoServerConnection.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/enterprise/deploy/provider/NoServerConnection.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- NoServerConnection.java	14 Aug 2003 09:37:23 -0000	1.1
  +++ NoServerConnection.java	22 Aug 2003 19:16:34 -0000	1.2
  @@ -161,4 +161,18 @@
       public ProgressObject redeploy(TargetModuleID[] moduleIDList, InputStream moduleArchive,
InputStream deploymentPlan) throws UnsupportedOperationException, IllegalStateException {
           return null;
       }
  +
  +    /**
  +     * @return null (there is no server available)
  +     */
  +    public String[] getSecurityRoleOptions(String securityRealm) {
  +        return null;
  +    }
  +
  +    /**
  +     * @return null (there is no server available)
  +     */
  +    public String[] getResourceJndiNames(String resourceClassName) {
  +        return null;
  +    }
   }
  
  
  
  1.2       +32 -1     incubator-geronimo/modules/core/src/java/org/apache/geronimo/enterprise/deploy/provider/ServerConnection.java
  
  Index: ServerConnection.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/enterprise/deploy/provider/ServerConnection.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServerConnection.java	14 Aug 2003 09:37:23 -0000	1.1
  +++ ServerConnection.java	22 Aug 2003 19:16:34 -0000	1.2
  @@ -73,6 +73,8 @@
    * @version $Revision$
    */
   public interface ServerConnection {
  +    // ---------------------- Methods required by DeploymentManager ----------------------
  +
       /**
        * Releases any server resources and closes the connection to the server.
        */
  @@ -137,4 +139,33 @@
        * @see javax.enterprise.deploy.spi.DeploymentManager#redeploy(javax.enterprise.deploy.spi.TargetModuleID[],
java.io.InputStream, java.io.InputStream)
        */
       public ProgressObject redeploy(TargetModuleID[] moduleIDList, InputStream moduleArchive,
InputStream deploymentPlan) throws UnsupportedOperationException, IllegalStateException;
  +
  +    // ---------------------- Methods required to populate Property Editors ----------------------
  +
  +    /**
  +     * Used to provide a list of security users/groups/roles that the deployer
  +     * can map a J2EE security role to.
  +     *
  +     * @param securityRealm The security realm in use by the application
  +     *
  +     * @return A list of security mapping options, or null if the current user
  +     *         is not authorized to retrieve that information, or the
  +     *         information is not available.
  +     */
  +    public String[] getSecurityRoleOptions(String securityRealm);
  +
  +    /**
  +     * Gets a list of the JNDI names of global resources of a particular type
  +     * defined in the server.  For example, a list of all javax.sql.DataSource
  +     * resources.  Note that any resources tied to a particular application
  +     * will not be included.
  +     *
  +     * @param resourceClassName The name of the interface that the resource
  +     *                          should implement (e.g. javax.sql.DataSource).
  +     *
  +     * @return A list of the JNDI names of the available resources.  Returns
  +     *         null of no such resources are available, the current user is
  +     *         not authorized to retrieve the list, etc.
  +     */
  +    public String[] getResourceJndiNames(String resourceClassName);
   }
  
  
  
  1.8       +17 -9     incubator-geronimo/modules/core/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/maven.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- maven.xml	22 Aug 2003 19:03:37 -0000	1.7
  +++ maven.xml	22 Aug 2003 19:16:34 -0000	1.8
  @@ -6,7 +6,7 @@
     xmlns:j="jelly:core"
     xmlns:ant="jelly:ant"
     xmlns:maven="jelly:maven">
  -  
  +
     <preGoal name="xdoc:jelly-transform">
       <attainGoal name="html2xdoc"/>
     </preGoal>
  @@ -36,6 +36,14 @@
       </ant:java>
     </preGoal>
   
  +  <postGoal name="java:compile">
  +    <ant:echo message="Generating a JSR-88 Product Provider JAR" />
  +    <ant:jar destfile="${basedir}/target/jsr88-geronimo-plugin.jar"
  +             basedir="${basedir}/target/classes"
  +             includes="org/apache/geronimo/enterprise/deploy/provider/**/*.class"
  +             manifest="${basedir}/src/conf/jsr88-product-provider-manifest.mf" />
  +  </postGoal>
  +
     <preGoal name="java:compile">
       <!--
       <j:set var="maven.javacc.compile.src" value="target/gen-src"/>
  @@ -50,26 +58,26 @@
                   javacchome="${maven.repo.local}/javacc/jars"/>
       -->
     </preGoal>
  -  
  +
     <!-- ============================== -->
     <!-- Helpers to run Apache Geronimo -->
     <!-- ============================== -->
  -  
  +
     <!-- jason: need to fix this -->
  -  
  +
     <goal name="run" description="Runs the Geronimo Server using the current build">
  -  
  +
       <ant:path id="test.classpath">
         <ant:pathelement path="target/test-classes"/>
         <ant:pathelement path="src/conf/"/>
         <ant:pathelement path="${maven.build.dest}"/>
         <ant:path refid="maven.dependency.classpath"/>
       </ant:path>
  -    
  +
       <ant:java classname="org.apache.geronimo.Main" fork="yes">
         <ant:classpath refid="test.classpath"/>
       </ant:java>
  -    
  +
     </goal>
  -  
  +
   </project>
  
  
  
  1.2       +39 -0     incubator-geronimo/modules/core/src/conf/jsr88-product-provider-manifest.mf
  
  Index: jsr88-product-provider-manifest.mf
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/conf/jsr88-product-provider-manifest.mf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- jsr88-product-provider-manifest.mf	14 Aug 2003 09:37:23 -0000	1.1
  +++ jsr88-product-provider-manifest.mf	22 Aug 2003 19:16:34 -0000	1.2
  @@ -1,2 +1,41 @@
   Manifest-Version: 1.0
   J2EE-DeploymentFactory-Implementation-Class: org.apache.geronimo.enterprise.deploy.provider.GeronimoDeploymentFactory
  +
  +Name: org/apache/geronimo/enterprise/deploy/provider/jar/ContextParam.class
  +Java-Bean: True
  +
  +Name: org/apache/geronimo/enterprise/deploy/provider/jar/EjbJarBean.class
  +Java-Bean: True
  +
  +Name: org/apache/geronimo/enterprise/deploy/provider/jar/EjbJarRoot.class
  +Java-Bean: True
  +
  +Name: org/apache/geronimo/enterprise/deploy/provider/jar/EjbLocalRefBean.class
  +Java-Bean: True
  +
  +Name: org/apache/geronimo/enterprise/deploy/provider/jar/EjbRefBean.class
  +Java-Bean: True
  +
  +Name: org/apache/geronimo/enterprise/deploy/provider/jar/EnterpriseBeansBean.class
  +Java-Bean: True
  +
  +Name: org/apache/geronimo/enterprise/deploy/provider/jar/EntityBean.class
  +Java-Bean: True
  +
  +Name: org/apache/geronimo/enterprise/deploy/provider/jar/EnvEntryBean.class
  +Java-Bean: True
  +
  +Name: org/apache/geronimo/enterprise/deploy/provider/jar/MessageDrivenBean.class
  +Java-Bean: True
  +
  +Name: org/apache/geronimo/enterprise/deploy/provider/jar/ResourceEnvRefBean.class
  +Java-Bean: True
  +
  +Name: org/apache/geronimo/enterprise/deploy/provider/jar/ResourceRefBean.class
  +Java-Bean: True
  +
  +Name: org/apache/geronimo/enterprise/deploy/provider/jar/SecurityRoleRefBean.class
  +Java-Bean: True
  +
  +Name: org/apache/geronimo/enterprise/deploy/provider/jar/SessionBean.class
  +Java-Bean: True
  
  
  

Mime
View raw message