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/deployment/src/java/org/apache/geronimo/deployment/plugin/factories DeploymentFactoryImpl.java
Date Wed, 26 May 2004 07:43:40 GMT
jboynes     2004/05/26 00:43:40

  Modified:    modules/assembly maven.xml
               modules/deployment/src/java/org/apache/geronimo/deployment
                        Bootstrap.java
               modules/deployment/src/java/org/apache/geronimo/deployment/plugin/factories
                        DeploymentFactoryImpl.java
  Log:
  Define manifest entry that marks deployer as a JSR-88 provider
  
  Revision  Changes    Path
  1.13      +2 -1      incubator-geronimo/modules/assembly/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/assembly/maven.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- maven.xml	19 May 2004 20:53:58 -0000	1.12
  +++ maven.xml	26 May 2004 07:43:39 -0000	1.13
  @@ -145,6 +145,7 @@
               j2eeDeployerPlan="${basedir}/src/plan/j2ee-deployer-plan.xml"
               deployerClassPath="${deploy.classpath}"
               deployerGBean="geronimo.deployment:role=Deployer,config=org/apache/geronimo/J2EEDeployer"
  +            deploymentFactory="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl"
               />
   
           <!-- build the system configuration and server.jar -->
  
  
  
  1.16      +14 -2     incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/Bootstrap.java
  
  Index: Bootstrap.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/Bootstrap.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- Bootstrap.java	23 Apr 2004 03:08:28 -0000	1.15
  +++ Bootstrap.java	26 May 2004 07:43:39 -0000	1.16
  @@ -48,6 +48,7 @@
       private String j2eeDeployerPlan;
       private String deployerClassPath;
       private String deployerGBean;
  +    private String deploymentFactory;
   
       public String getDeployerJar() {
           return deployerJar;
  @@ -105,6 +106,14 @@
           this.deployerGBean = deployerGBean;
       }
   
  +    public String getDeploymentFactory() {
  +        return deploymentFactory;
  +    }
  +
  +    public void setDeploymentFactory(String deploymentFactory) {
  +        this.deploymentFactory = deploymentFactory;
  +    }
  +
       public void bootstrap() throws Exception {
           ClassLoader oldCL = Thread.currentThread().getContextClassLoader();
           Thread.currentThread().setContextClassLoader(Bootstrap.class.getClassLoader());
  @@ -129,12 +138,15 @@
               mainAttributes.putValue(CommandLineManifest.MAIN_METHOD.toString(), "deploy");
               mainAttributes.putValue(CommandLineManifest.CONFIGURATIONS.toString(), j2eeDeployerConfig.getConfigId());
   
  +            // attribute that indicates to a JSR-88 tool that we have a Deployment factory
  +            mainAttributes.putValue("J2EE-DeploymentFactory-Implementation-Class", deploymentFactory);
  +
               // build and install the deployer-system configuration
               // write the deployer system out to a jar
               File outputFile = new File(deployerJar);
               JarOutputStream jos = new JarOutputStream(new BufferedOutputStream(new FileOutputStream(outputFile)),
manifest);
               try {
  -                // add the startup jar entry which allows us to locat the startup directory
  +                // add the startup jar entry which allows us to locate the startup directory
                   jos.putNextEntry(new ZipEntry("META-INF/startup-jar"));
                   jos.closeEntry();
   
  
  
  
  1.10      +2 -2      incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryImpl.java
  
  Index: DeploymentFactoryImpl.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/deployment/src/java/org/apache/geronimo/deployment/plugin/factories/DeploymentFactoryImpl.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DeploymentFactoryImpl.java	10 Mar 2004 09:58:49 -0000	1.9
  +++ DeploymentFactoryImpl.java	26 May 2004 07:43:39 -0000	1.10
  @@ -48,7 +48,7 @@
       }
   
       public String getProductVersion() {
  -        return "0.1";
  +        return "1.0";
       }
   
       public boolean handlesURI(String uri) {
  
  
  

Mime
View raw message