geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r512474 - in /geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec: ./ src/main/java/javax/enterprise/deploy/shared/ src/main/java/javax/enterprise/deploy/spi/ src/test/java/javax/enterprise/deploy/shared/ src/test/java/javax/enterpr...
Date Tue, 27 Feb 2007 23:07:44 GMT
Author: djencks
Date: Tue Feb 27 15:07:43 2007
New Revision: 512474

URL: http://svn.apache.org/viewvc?view=rev&rev=512474
Log:
GERONIMO-2701 update enterprise deployment spec to 1.1MR3

Added:
    geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/
      - copied from r500316, geronimo/specs/tags/geronimo-j2ee-deployment_1.1_spec-1.1/
Modified:
    geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/pom.xml
    geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/src/main/java/javax/enterprise/deploy/shared/DConfigBeanVersionType.java
    geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/src/main/java/javax/enterprise/deploy/spi/DeploymentManager.java
    geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/src/test/java/javax/enterprise/deploy/shared/DConfigBeanVersionTypeTest.java
    geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/src/test/java/javax/enterprise/deploy/spi/MockDeploymentManager.java

Modified: geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/pom.xml?view=diff&rev=512474&r1=500316&r2=512474
==============================================================================
--- geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/pom.xml (original)
+++ geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/pom.xml Tue Feb 27 15:07:43
2007
@@ -31,14 +31,14 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
-    <name>J2EE Deployment 1.1</name>
-    <version>1.1</version>
+    <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+    <name>JAVAEE Deployment 1.1MR3</name>
+    <version>1.0-SNAPHSOT</version>
 
 
   <scm>
-    <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-j2ee-deployment_1.1_spec-1.1</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-j2ee-deployment_1.1_spec-1.1</developerConnection>
-    <url>https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-j2ee-deployment_1.1_spec-1.1</url>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-javaee-deployment_1.1MR3_spec-1.0</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-javaee-deployment_1.1MR3_spec-1.0</developerConnection>
+    <url>https://svn.apache.org/repos/asf/geronimo/specs/tags/geronimo-javaee-deployment_1.1MR3_spec-1.0</url>
   </scm>
 </project>

Modified: geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/src/main/java/javax/enterprise/deploy/shared/DConfigBeanVersionType.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/src/main/java/javax/enterprise/deploy/shared/DConfigBeanVersionType.java?view=diff&rev=512474&r1=500316&r2=512474
==============================================================================
--- geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/src/main/java/javax/enterprise/deploy/shared/DConfigBeanVersionType.java
(original)
+++ geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/src/main/java/javax/enterprise/deploy/shared/DConfigBeanVersionType.java
Tue Feb 27 15:07:43 2007
@@ -38,6 +38,7 @@
     public static final DConfigBeanVersionType V1_3 = new DConfigBeanVersionType(0);
     /**
      * J2EE Platform version 1.3.1
+     * DO NOT USE THIS, USE V1_3 instead
      */
     public static final DConfigBeanVersionType V1_3_1 = new DConfigBeanVersionType(1);
     /**
@@ -45,16 +46,23 @@
      */
     public static final DConfigBeanVersionType V1_4 = new DConfigBeanVersionType(2);
 
+    /**
+     * JAVAEE Platform version 1.5
+     */
+    public static final DConfigBeanVersionType V5 = new DConfigBeanVersionType(3);
+
     private static final DConfigBeanVersionType[] enumValueTable = {
         V1_3,
         V1_3_1,
         V1_4,
+        V5,
     };
 
     private static final String[] stringTable = {
         "V1_3",
         "V1_3_1",
         "V1_4",
+        "V5",
     };
 
     private int value;
@@ -101,7 +109,7 @@
      * value if outside the bounds of the table
      */
     public String toString() {
-        return (value >= 0 && value <= 2) ? getStringTable()[value] : String.valueOf(value);
+        return (value >= 0 && value <= 3) ? getStringTable()[value] : String.valueOf(value);
     }
 
     /**

Modified: geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/src/main/java/javax/enterprise/deploy/spi/DeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/src/main/java/javax/enterprise/deploy/spi/DeploymentManager.java?view=diff&rev=512474&r1=500316&r2=512474
==============================================================================
--- geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/src/main/java/javax/enterprise/deploy/spi/DeploymentManager.java
(original)
+++ geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/src/main/java/javax/enterprise/deploy/spi/DeploymentManager.java
Tue Feb 27 15:07:43 2007
@@ -151,8 +151,27 @@
      * @return an object that tracks and reports the status of the distribution process.
      *
      * @throws IllegalStateException is thrown when the method is called when running in
disconnected mode.
+     * @deprecated use the following method including the moduletype instead
      */
     public ProgressObject distribute(Target[] targetList, InputStream moduleArchive, InputStream
deploymentPlan) throws IllegalStateException;
+
+    /**
+     * The distribute method performs three tasks; it validates the deployment
+     * configuration data, generates all container specific classes and interfaces,
+     * and moves the fully baked archive to the designated deployment targets.
+     *
+     * @param targetList     A list of server targets the user is specifying this application
+     *                       should be deployed to.
+     * @param moduleType     The module type of the application archive to be distributed.
+     * @param moduleArchive  The stream containing the application archive to be distributed.
+     * @param deploymentPlan The stream containing the runtime configuration information
+     *                       associated with this application archive.
+     *
+     * @return an object that tracks and reports the status of the distribution process.
+     *
+     * @throws IllegalStateException is thrown when the method is called when running in
disconnected mode.
+     */
+    public ProgressObject distribute(Target[] targetList, ModuleType moduleType, InputStream
moduleArchive, InputStream deploymentPlan) throws IllegalStateException;
 
     /**
      * Start the application running.

Modified: geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/src/test/java/javax/enterprise/deploy/shared/DConfigBeanVersionTypeTest.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/src/test/java/javax/enterprise/deploy/shared/DConfigBeanVersionTypeTest.java?view=diff&rev=512474&r1=500316&r2=512474
==============================================================================
--- geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/src/test/java/javax/enterprise/deploy/shared/DConfigBeanVersionTypeTest.java
(original)
+++ geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/src/test/java/javax/enterprise/deploy/shared/DConfigBeanVersionTypeTest.java
Tue Feb 27 15:07:43 2007
@@ -35,12 +35,14 @@
         assertEquals(0, DConfigBeanVersionType.V1_3.getValue());
         assertEquals(1, DConfigBeanVersionType.V1_3_1.getValue());
         assertEquals(2, DConfigBeanVersionType.V1_4.getValue());
+        assertEquals(3, DConfigBeanVersionType.V5.getValue());
     }
 
     public void testToString() {
         assertEquals("V1_3", DConfigBeanVersionType.V1_3.toString());
         assertEquals("V1_3_1", DConfigBeanVersionType.V1_3_1.toString());
         assertEquals("V1_4", DConfigBeanVersionType.V1_4.toString());
+        assertEquals("V5", DConfigBeanVersionType.V5.toString());
         // only possible due to package local access
         assertEquals("5", new ActionType(5).toString());
     }
@@ -55,7 +57,7 @@
 
     public void testValueToLarge() {
         try {
-            DConfigBeanVersionType.getDConfigBeanVersionType(3);
+            DConfigBeanVersionType.getDConfigBeanVersionType(4);
             fail("Expected AIOOBE");
         } catch (ArrayIndexOutOfBoundsException aioobe) {
         }

Modified: geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/src/test/java/javax/enterprise/deploy/spi/MockDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/src/test/java/javax/enterprise/deploy/spi/MockDeploymentManager.java?view=diff&rev=512474&r1=500316&r2=512474
==============================================================================
--- geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/src/test/java/javax/enterprise/deploy/spi/MockDeploymentManager.java
(original)
+++ geronimo/specs/trunk/geronimo-javaee-deployment_1.1MR3_spec/src/test/java/javax/enterprise/deploy/spi/MockDeploymentManager.java
Tue Feb 27 15:07:43 2007
@@ -68,6 +68,10 @@
         return null;
     }
 
+    public ProgressObject distribute(Target[] targetList, ModuleType moduleType, InputStream
moduleArchive, InputStream deploymentPlan) throws IllegalStateException {
+        return null;
+    }
+
     public ProgressObject start(TargetModuleID[] moduleIDList) throws IllegalStateException
{
         return null;
     }



Mime
View raw message