dain 2004/04/15 22:34:05
Modified: modules/assembly maven.xml project.xml
Log:
Changed container id to a String
Simplified requirements to create an EJBProxyFactory
EJBProxyFactory is now constructed in the GenericEJBContainer constructor
Change ProxyRefAddress to store the class names instead of a proxy info
object; this allows the construction of an ejb-ref without knowing the
container type
Merged stateless and stateful object base classes into a single class,
which simplifies proxy construction
Revision Changes Path
1.3 +5 -1 openejb/modules/assembly/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/assembly/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 14 Apr 2004 04:54:32 -0000 1.2
+++ maven.xml 16 Apr 2004 02:34:05 -0000 1.3
@@ -128,6 +128,7 @@
<ant:echo>Building system configuration</ant:echo>
<ant:mkdir dir="${distDir}/bin"/>
<ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
+ <ant:jvmarg value="-ea"/>
<ant:arg value="--install"/>
<ant:arg value="--plan"/>
<ant:arg value="src/plan/system-plan.xml"/>
@@ -138,6 +139,7 @@
<!-- build the J2EEServer configuration -->
<ant:echo>Building server configuration</ant:echo>
<ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
+ <ant:jvmarg value="-ea"/>
<ant:arg value="--install"/>
<ant:arg value="--plan"/>
<ant:arg value="src/plan/j2ee-server-plan.xml"/>
@@ -146,6 +148,7 @@
<!-- build the itests configuration -->
<ant:echo>Building default database configuration</ant:echo>
<ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
+ <ant:jvmarg value="-ea"/>
<ant:arg value="--install"/>
<ant:arg value="--module"/>
<ant:arg value="${project.root}/modules/connector/target/jdbc.rar"/>
@@ -154,6 +157,7 @@
<!-- build the itests configuration -->
<ant:echo>Building itests configuration</ant:echo>
<ant:java fork="true" jar="${distDir}/bin/deployer.jar" failonerror="true">
+ <ant:jvmarg value="-ea"/>
<ant:arg value="--install"/>
<ant:arg value="--module"/>
<ant:arg
value="${project.root}/modules/itests/target/openejb-itests-beans2.jar"/>
1.3 +87 -85 openejb/modules/assembly/project.xml
Index: project.xml
===================================================================
RCS file: /home/projects/openejb/scm/openejb/modules/assembly/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 14 Apr 2004 04:54:32 -0000 1.2
+++ project.xml 16 Apr 2004 02:34:05 -0000 1.3
@@ -52,7 +52,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-common</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>DEV</version>
<properties>
<lib>true</lib>
<deploy>true</deploy>
@@ -63,7 +63,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-connector</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>DEV</version>
<properties>
<repository>true</repository>
</properties>
@@ -72,7 +72,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-core</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>DEV</version>
<properties>
<repository>true</repository>
</properties>
@@ -81,7 +81,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-deployment</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>DEV</version>
<properties>
<lib>true</lib>
<deploy>true</deploy>
@@ -92,7 +92,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-j2ee</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>DEV</version>
<properties>
<repository>true</repository>
</properties>
@@ -101,7 +101,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-kernel</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>DEV</version>
<properties>
<lib>true</lib>
<server>true</server>
@@ -113,7 +113,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-naming</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>DEV</version>
<properties>
<repository>true</repository>
</properties>
@@ -122,7 +122,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-remoting</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>DEV</version>
<properties>
<repository>true</repository>
</properties>
@@ -131,7 +131,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-security</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>DEV</version>
<properties>
<repository>true</repository>
</properties>
@@ -140,7 +140,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-system</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>DEV</version>
<properties>
<lib>true</lib>
<server>true</server>
@@ -152,7 +152,7 @@
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-transaction</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>DEV</version>
<properties>
<repository>true</repository>
</properties>
@@ -161,7 +161,7 @@
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2ee</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>DEV</version>
<properties>
<repository>true</repository>
</properties>
@@ -170,7 +170,34 @@
<dependency>
<groupId>geronimo-spec</groupId>
<artifactId>geronimo-spec-j2eeschema</artifactId>
- <version>${pom.currentVersion}</version>
+ <version>DEV</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>tranql</groupId>
+ <artifactId>tranql</artifactId>
+ <version>DEV</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>axion</groupId>
+ <artifactId>axion</artifactId>
+ <version>1.0-M3-dev</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>castor</groupId>
+ <artifactId>castor</artifactId>
+ <version>0.9.3.9</version>
<properties>
<repository>true</repository>
</properties>
@@ -179,7 +206,7 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib-full</artifactId>
- <version>2.0-RC2</version>
+ <version>2.0</version>
<url>http://cglib.sf.net/</url>
<properties>
<lib>true</lib>
@@ -201,6 +228,15 @@
</dependency>
<dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.0</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
@@ -213,6 +249,15 @@
</dependency>
<dependency>
+ <groupId>commons-primitives</groupId>
+ <artifactId>commons-primitives</artifactId>
+ <version>1.0</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
<version>1.3.2</version>
@@ -222,6 +267,24 @@
</dependency>
<dependency>
+ <groupId>idb</groupId>
+ <artifactId>idb</artifactId>
+ <version>3.26</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.8</version>
@@ -245,6 +308,15 @@
</dependency>
<dependency>
+ <groupId>regexp</groupId>
+ <artifactId>regexp</artifactId>
+ <version>1.3</version>
+ <properties>
+ <repository>true</repository>
+ </properties>
+ </dependency>
+
+ <dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.6.0</version>
@@ -274,75 +346,5 @@
</properties>
</dependency>
- <dependency>
- <groupId>tranql</groupId>
- <artifactId>tranql</artifactId>
- <version>SNAPSHOT</version>
- <properties>
- <repository>true</repository>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>castor</groupId>
- <artifactId>castor</artifactId>
- <version>0.9.3.9</version>
- <properties>
- <repository>true</repository>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.0</version>
- <properties>
- <repository>true</repository>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>idb</groupId>
- <artifactId>idb</artifactId>
- <version>3.26</version>
- <properties>
- <repository>true</repository>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8</version>
- <properties>
- <repository>true</repository>
- </properties>
- </dependency>
-
- <dependency>
- <groupId>axion</groupId>
- <artifactId>axion</artifactId>
- <version>1.0-M3-dev</version>
- <properties>
- <repository>true</repository>
- </properties>
- </dependency>
- <dependency>
- <groupId>commons-primitives</groupId>
- <artifactId>commons-primitives</artifactId>
- <version>1.0</version>
- <properties>
- <repository>true</repository>
- </properties>
- </dependency>
- <dependency>
- <groupId>regexp</groupId>
- <artifactId>regexp</artifactId>
- <version>1.3</version>
- <properties>
- <repository>true</repository>
- </properties>
- </dependency>
-
</dependencies>
</project>
