You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2006/08/26 21:43:18 UTC
svn commit: r437216 - in /geronimo/server/branches/sachin: ./
applications/geronimo-examples/geronimo-jsp-examples/
configs/geronimo-gbean-deployer/ configs/hot-deployer/
configs/j2ee-deployer/ configs/j2ee-deployer/src/plan/ configs/rmi-naming/
module...
Author: sppatel
Date: Sat Aug 26 12:43:14 2006
New Revision: 437216
URL: http://svn.apache.org/viewvc?rev=437216&view=rev
Log:
merge from head
Added:
geronimo/server/branches/sachin/modules/j2ee-schema/src/main/
- copied from r437211, geronimo/server/trunk/modules/j2ee-schema/src/main/
geronimo/server/branches/sachin/modules/j2ee-schema/src/main/java/
- copied from r437211, geronimo/server/trunk/modules/j2ee-schema/src/main/java/
geronimo/server/branches/sachin/modules/j2ee-schema/src/main/java/org/
- copied from r437211, geronimo/server/trunk/modules/j2ee-schema/src/main/java/org/
geronimo/server/branches/sachin/modules/j2ee-schema/src/main/java/org/apache/
- copied from r437211, geronimo/server/trunk/modules/j2ee-schema/src/main/java/org/apache/
geronimo/server/branches/sachin/modules/j2ee-schema/src/main/java/org/apache/geronimo/
- copied from r437211, geronimo/server/trunk/modules/j2ee-schema/src/main/java/org/apache/geronimo/
geronimo/server/branches/sachin/modules/j2ee-schema/src/main/java/org/apache/geronimo/schema/
- copied from r437211, geronimo/server/trunk/modules/j2ee-schema/src/main/java/org/apache/geronimo/schema/
geronimo/server/branches/sachin/modules/j2ee-schema/src/main/java/org/apache/geronimo/schema/ElementConverter.java
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/main/java/org/apache/geronimo/schema/ElementConverter.java
geronimo/server/branches/sachin/modules/j2ee-schema/src/main/java/org/apache/geronimo/schema/GBeanElementConverter.java
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/main/java/org/apache/geronimo/schema/GBeanElementConverter.java
geronimo/server/branches/sachin/modules/j2ee-schema/src/main/java/org/apache/geronimo/schema/NamespaceElementConverter.java
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/main/java/org/apache/geronimo/schema/NamespaceElementConverter.java
geronimo/server/branches/sachin/modules/j2ee-schema/src/main/java/org/apache/geronimo/schema/QNameConverter.java
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/main/java/org/apache/geronimo/schema/QNameConverter.java
geronimo/server/branches/sachin/modules/j2ee-schema/src/main/java/org/apache/geronimo/schema/SchemaConversionUtils.java
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/main/java/org/apache/geronimo/schema/SchemaConversionUtils.java
geronimo/server/branches/sachin/modules/j2ee-schema/src/main/java/org/apache/geronimo/schema/SecurityElementConverter.java
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/main/java/org/apache/geronimo/schema/SecurityElementConverter.java
geronimo/server/branches/sachin/modules/j2ee-schema/src/main/resources/
- copied from r437211, geronimo/server/trunk/modules/j2ee-schema/src/main/resources/
geronimo/server/branches/sachin/modules/j2ee-schema/src/main/resources/META-INF/
- copied from r437211, geronimo/server/trunk/modules/j2ee-schema/src/main/resources/META-INF/
geronimo/server/branches/sachin/modules/j2ee-schema/src/main/resources/META-INF/geronimo-dependency.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/main/resources/META-INF/geronimo-dependency.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/java/
- copied from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/java/
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/java/org/
- copied from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/java/org/
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/java/org/apache/
- copied from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/java/org/apache/
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/java/org/apache/geronimo/
- copied from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/java/org/apache/geronimo/
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/java/org/apache/geronimo/schema/
- copied from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/java/org/apache/geronimo/schema/
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/
- copied from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/geronimo/
- copied from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/geronimo/
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/geronimo/ejb-naming-post.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/geronimo/ejb-naming-post.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/geronimo/ejb-naming-pre.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/geronimo/ejb-naming-pre.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/geronimo/gbean-post.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/geronimo/gbean-post.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/geronimo/gbean-pre.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/geronimo/gbean-pre.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/geronimo/qname1-post.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/geronimo/qname1-post.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/geronimo/qname1-pre.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/geronimo/qname1-pre.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/geronimo/qname2-post.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/geronimo/qname2-post.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/geronimo/qname2-pre.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/geronimo/qname2-pre.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/geronimo/security-post.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/geronimo/security-post.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/geronimo/security-pre.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/geronimo/security-pre.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/geronimo/web-md-post.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/geronimo/web-md-post.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/geronimo/web-md-pre.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/geronimo/web-md-pre.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_2dtd/
- copied from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_2dtd/
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_2dtd/ejb-1-11.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_2dtd/ejb-1-11.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_2dtd/ejb-1-21.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_2dtd/ejb-1-21.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_2dtd/web-1-22.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_2dtd/web-1-22.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_2dtd/web-1-24.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_2dtd/web-1-24.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/
- copied from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/DescriptionGroupTestExpected.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/DescriptionGroupTestExpected.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/DescriptionGroupTestSource.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/DescriptionGroupTestSource.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/JNDIEnvironmentRefsGroupTestExpected.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/JNDIEnvironmentRefsGroupTestExpected.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/JNDIEnvironmentRefsGroupTestSource.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/JNDIEnvironmentRefsGroupTestSource.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/application-13.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/application-13.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/application-14.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/application-14.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/application-client-13.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/application-client-13.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/application-client-14.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/application-client-14.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/ejb-jar-21.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/ejb-jar-21.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/ejb-jar.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/ejb-jar.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/mdb-ejb-jar-20-GERONIMO-1649.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/mdb-ejb-jar-20-GERONIMO-1649.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/mdb-ejb-jar-20.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/mdb-ejb-jar-20.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/mdb-ejb-jar-21-GERONIMO-1649.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/mdb-ejb-jar-21-GERONIMO-1649.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/mdb-ejb-jar-21.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/mdb-ejb-jar-21.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/ra-10.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/ra-10.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/ra-15.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/ra-15.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/tmp.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/tmp.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/web-1-23.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/web-1-23.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/web-1-24.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/web-1-24.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/web-23.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/web-23.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/web-24.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_3dtd/web-24.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_4schema/
- copied from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_4schema/
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_4schema/ejb-jar.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_4schema/ejb-jar.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_4schema/web-1-24.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_4schema/web-1-24.xml
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/resources/j2ee_1_4schema/web-2-24.xml
- copied unchanged from r437211, geronimo/server/trunk/modules/j2ee-schema/src/test/resources/j2ee_1_4schema/web-2-24.xml
Removed:
geronimo/server/branches/sachin/modules/j2ee-schema/src/catalog/
geronimo/server/branches/sachin/modules/j2ee-schema/src/conf/
geronimo/server/branches/sachin/modules/j2ee-schema/src/j2ee_1_2schema/
geronimo/server/branches/sachin/modules/j2ee-schema/src/j2ee_1_3schema/
geronimo/server/branches/sachin/modules/j2ee-schema/src/j2ee_1_4schema/
geronimo/server/branches/sachin/modules/j2ee-schema/src/java/
geronimo/server/branches/sachin/modules/j2ee-schema/src/resources/
geronimo/server/branches/sachin/modules/j2ee-schema/src/test-data/
geronimo/server/branches/sachin/modules/j2ee-schema/src/test/org/
geronimo/server/branches/sachin/modules/j2ee-schema/src/xsl/
Modified:
geronimo/server/branches/sachin/STATUS
geronimo/server/branches/sachin/applications/geronimo-examples/geronimo-jsp-examples/pom.xml
geronimo/server/branches/sachin/configs/geronimo-gbean-deployer/pom.xml
geronimo/server/branches/sachin/configs/hot-deployer/pom.xml
geronimo/server/branches/sachin/configs/j2ee-deployer/pom.xml
geronimo/server/branches/sachin/configs/j2ee-deployer/src/plan/plan.xml
geronimo/server/branches/sachin/configs/rmi-naming/pom.xml
geronimo/server/branches/sachin/modules/j2ee-schema/pom.xml
geronimo/server/branches/sachin/pom.xml
Modified: geronimo/server/branches/sachin/STATUS
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/STATUS?rev=437216&r1=437215&r2=437216&view=diff
==============================================================================
--- geronimo/server/branches/sachin/STATUS (original)
+++ geronimo/server/branches/sachin/STATUS Sat Aug 26 12:43:14 2006
@@ -8,7 +8,7 @@
Upcoming Releases:
Geronimo 1.2 -- geronimo/trunk/
- Release Manager: Matt Hogstrom
+ Release Manager: not yet voted
Estimated Date: September ??
Geronimo 1.1.1 -- geronimo/branches/1.1
@@ -17,9 +17,31 @@
RELEASE SHOWSTOPPERS:
+Currently the 1.1.1 release is addressing security issues that are related to CTS failures as well
+as reworking our build and release process to address potential violations of Sun's License for the
+specification related XSDs. Our work around includes using XML beans to download and generate the
+code necessary to manipulate the XSDs without including Sun's content in SVN or our released code.
Outstanding patches awaiting votes:
+On JIRA, the following patches are oustanding:
+
+XBEAN-45 Move classloaders to their own module - Patch Available - Alan Cabrera - Opened 19/Aug/06
+ Status: review needed. 1 +1 vote provided...need two more
+
+GERONIMO-2332 RTC Put the generated xmlbeans files for the j2ee 1.4 schemas in svn in a spec module
+so we don't need the schemas in svn at all - Patch Available - David Jencks - Opened: 18/Aug/06
+ Status: in progress
+
+GERONIMO-2248 Applications portlets: List Parent and Child components against each component
+Patch Available Unassigned - Opened: 30/Jul/06
+ Status: Needs to complete voting and apply to 1.1.2 and trunk
+
+GERONIMO-2163 WADI Integration for Jetty - Patch Available - Gianny Damour - Opened: 02/Jul/06
+ Status: Not actually in a state for voting...this is in a discussion state.
+
+GERONIMO-2015 Let's replace JKS to PKCS12 key store type - Opened
+ Status: In discussion...although not totally active
Release history:
2006-06-26 Geronimo 1.1
Modified: geronimo/server/branches/sachin/applications/geronimo-examples/geronimo-jsp-examples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/applications/geronimo-examples/geronimo-jsp-examples/pom.xml?rev=437216&r1=437215&r2=437216&view=diff
==============================================================================
--- geronimo/server/branches/sachin/applications/geronimo-examples/geronimo-jsp-examples/pom.xml (original)
+++ geronimo/server/branches/sachin/applications/geronimo-examples/geronimo-jsp-examples/pom.xml Sat Aug 26 12:43:14 2006
@@ -69,30 +69,13 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jspc-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>jspc</id>
- <goals>
- <goal>compile</goal>
- </goals>
- <configuration>
- <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
- <inputWebXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</inputWebXml>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <configuration>
- <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
- <webXml>${pom.basedir}/target/jspweb.xml</webXml>
- <archiveClasses>true</archiveClasses>
- </configuration>
</plugin>
</plugins>
</build>
-
+
</project>
Modified: geronimo/server/branches/sachin/configs/geronimo-gbean-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/geronimo-gbean-deployer/pom.xml?rev=437216&r1=437215&r2=437216&view=diff
==============================================================================
--- geronimo/server/branches/sachin/configs/geronimo-gbean-deployer/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/geronimo-gbean-deployer/pom.xml Sat Aug 26 12:43:14 2006
@@ -53,7 +53,17 @@
<artifactId>geronimo-deploy-tool</artifactId>
<version>${pom.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-deploy-config</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+
<!-- Thirdparty Dependencies -->
<dependency>
Modified: geronimo/server/branches/sachin/configs/hot-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/hot-deployer/pom.xml?rev=437216&r1=437215&r2=437216&view=diff
==============================================================================
--- geronimo/server/branches/sachin/configs/hot-deployer/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/hot-deployer/pom.xml Sat Aug 26 12:43:14 2006
@@ -46,18 +46,11 @@
<artifactId>j2ee-deployer</artifactId>
<version>${pom.version}</version>
<type>car</type>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-hot-deploy</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-deploy-tool</artifactId>
<version>${pom.version}</version>
</dependency>
Modified: geronimo/server/branches/sachin/configs/j2ee-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/j2ee-deployer/pom.xml?rev=437216&r1=437215&r2=437216&view=diff
==============================================================================
--- geronimo/server/branches/sachin/configs/j2ee-deployer/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/j2ee-deployer/pom.xml Sat Aug 26 12:43:14 2006
@@ -85,11 +85,11 @@
<artifactId>geronimo-web-builder</artifactId>
<version>${pom.version}</version>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-webservices</artifactId>-->
- <!--<version>${pom.version}</version>-->
- <!--</dependency>-->
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-test-ddbean</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
<!-- this should get connector -->
<dependency>
@@ -97,32 +97,6 @@
<artifactId>geronimo-connector-builder</artifactId>
<version>${pom.version}</version>
</dependency>
- <!-- should include as geronimo-dependency.xml in connector-builder jar -->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-connector</artifactId>-->
- <!--<version>${pom.version}</version>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-management</artifactId>-->
- <!--<version>${pom.version}</version>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-j2ee</artifactId>-->
- <!--<version>${pom.version}</version>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-transaction</artifactId>-->
- <!--<version>${pom.version}</version>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-interceptor</artifactId>-->
- <!--<version>${pom.version}</version>-->
- <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -130,20 +104,11 @@
<version>${pom.version}</version>
</dependency>
- <!-- webservices, naming -->
<!-- why is this spec not in the classpath ?? -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.specs</groupId>-->
- <!--<artifactId>geronimo-jta_1.0.1B_spec</artifactId>-->
- <!--</dependency>-->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
Modified: geronimo/server/branches/sachin/configs/j2ee-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/j2ee-deployer/src/plan/plan.xml?rev=437216&r1=437215&r2=437216&view=diff
==============================================================================
--- geronimo/server/branches/sachin/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/j2ee-deployer/src/plan/plan.xml Sat Aug 26 12:43:14 2006
@@ -91,7 +91,7 @@
<!-- web switching builder -->
<gbean name="WebBuilder" class="org.apache.geronimo.j2ee.deployment.SwitchingModuleBuilder">
- <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.1</attribute>
+ <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2</attribute>
<references name="ModuleBuilders">
<pattern>
<name>JettyWebBuilder</name>
Modified: geronimo/server/branches/sachin/configs/rmi-naming/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/rmi-naming/pom.xml?rev=437216&r1=437215&r2=437216&view=diff
==============================================================================
--- geronimo/server/branches/sachin/configs/rmi-naming/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/rmi-naming/pom.xml Sat Aug 26 12:43:14 2006
@@ -60,11 +60,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
</dependency>
Modified: geronimo/server/branches/sachin/modules/j2ee-schema/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/j2ee-schema/pom.xml?rev=437216&r1=437215&r2=437216&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/j2ee-schema/pom.xml (original)
+++ geronimo/server/branches/sachin/modules/j2ee-schema/pom.xml Sat Aug 26 12:43:14 2006
@@ -47,7 +47,12 @@
<dependencies>
- <!-- Thirdparty Dependencies -->
+ <!-- might not be necessary -->
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
<dependency>
<groupId>xmlbeans</groupId>
@@ -64,80 +69,23 @@
<artifactId>stax-api</artifactId>
</dependency>
- <!-- might not be necessary -->
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-service-builder</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- </dependencies>
-
- <build>
<!--
- FIXME: Convert module to m2 standard layout
+ NOTE: The full source for this artifact is private due to Sun licensing issues.
+ To view the generated XmlBeans source please see the -src artifact in the repository:
+
+ http://people.apache.org/repo/m2-snapshot-repository/org/apache/geronimo/schema/geronimo-schema-j2ee1.4/
+
+ The full source is here with restricted access:
+
+ https://svn.apache.org/repos/tck/geronimo-tck/schema/j2ee14
-->
-
- <sourceDirectory>src/java</sourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
-
- <resources>
- <resource>
- <directory>src/resources</directory>
- </resource>
- </resources>
-
- <testResources>
- <testResource>
- <directory>src/test-data</directory>
- </testResource>
+ <dependency>
+ <groupId>org.apache.geronimo.schema</groupId>
+ <artifactId>geronimo-schema-j2ee1.4</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
- <testResource>
- <directory>src/test-resources</directory>
- </testResource>
- </testResources>
-
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xmlbeans-maven-plugin</artifactId>
- <configuration>
- <schemaDirectory>${pom.basedir}/src</schemaDirectory>
- <sourceSchemas>j2ee_1_3schema/connector_1_0.xsd,j2ee_1_4schema/application_1_4.xsd,j2ee_1_4schema/j2ee_jaxrpc_mapping_1_1.xsd,j2ee_1_4schema/j2ee_1_4.xsd,j2ee_1_4schema/connector_1_5.xsd,j2ee_1_4schema/ejb-jar_2_1.xsd,j2ee_1_4schema/web-app_2_4.xsd,j2ee_1_4schema/application-client_1_4.xsd,j2ee_1_4schema/j2ee_web_services_1_1.xsd</sourceSchemas>
- <xmlConfigs>
- <xmlConfig implementation="java.io.File">${pom.basedir}/src/conf</xmlConfig>
- </xmlConfigs>
- </configuration>
- </plugin>
-
-
- <!--
- HACK: Copy the generated XmlBeans bits for clover
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <mkdir dir="${pom.basedir}/target/clover/classes"/>
- <copy todir="${pom.basedir}/target/clover/classes">
- <fileset dir="${pom.basedir}/target/classes">
- <include name="schemaorg_apache_xmlbeans/**"/>
- </fileset>
- </copy>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ </dependencies>
</project>
Modified: geronimo/server/branches/sachin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/pom.xml?rev=437216&r1=437215&r2=437216&view=diff
==============================================================================
--- geronimo/server/branches/sachin/pom.xml (original)
+++ geronimo/server/branches/sachin/pom.xml Sat Aug 26 12:43:14 2006
@@ -939,6 +939,17 @@
<addMavenDescriptor>false</addMavenDescriptor>
</archive>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-archiver</artifactId>
+ <!--
+ FIXME: 2.1 is broken... won't allow custom manifestEntires, need to use
+ this snap until 2.2 is released.
+ -->
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>