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/09/27 20:22:21 UTC
svn commit: r450537 [1/2] - in /geronimo/server/branches/sachin: ./
assemblies/ assemblies/geronimo-framework/
assemblies/geronimo-framework/src/ assemblies/geronimo-framework/src/main/
assemblies/geronimo-framework/src/main/assembly/ assemblies/geroni...
Author: sppatel
Date: Wed Sep 27 11:22:17 2006
New Revision: 450537
URL: http://svn.apache.org/viewvc?view=rev&rev=450537
Log:
update from head
Added:
geronimo/server/branches/sachin/assemblies/geronimo-framework/
- copied from r450525, geronimo/server/trunk/assemblies/geronimo-framework/
geronimo/server/branches/sachin/assemblies/geronimo-framework/LICENSE.txt
- copied unchanged from r450525, geronimo/server/trunk/assemblies/geronimo-framework/LICENSE.txt
geronimo/server/branches/sachin/assemblies/geronimo-framework/NOTICE.txt
- copied unchanged from r450525, geronimo/server/trunk/assemblies/geronimo-framework/NOTICE.txt
geronimo/server/branches/sachin/assemblies/geronimo-framework/pom.xml
- copied unchanged from r450525, geronimo/server/trunk/assemblies/geronimo-framework/pom.xml
geronimo/server/branches/sachin/assemblies/geronimo-framework/src/
- copied from r450525, geronimo/server/trunk/assemblies/geronimo-framework/src/
geronimo/server/branches/sachin/assemblies/geronimo-framework/src/main/
- copied from r450525, geronimo/server/trunk/assemblies/geronimo-framework/src/main/
geronimo/server/branches/sachin/assemblies/geronimo-framework/src/main/assembly/
- copied from r450525, geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/
geronimo/server/branches/sachin/assemblies/geronimo-framework/src/main/assembly/bin.xml
- copied unchanged from r450525, geronimo/server/trunk/assemblies/geronimo-framework/src/main/assembly/bin.xml
geronimo/server/branches/sachin/assemblies/geronimo-framework/src/main/var/
- copied from r450525, geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/
geronimo/server/branches/sachin/assemblies/geronimo-framework/src/main/var/config/
- copied from r450525, geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/
geronimo/server/branches/sachin/assemblies/geronimo-framework/src/main/var/config/config.xml
- copied unchanged from r450525, geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/config.xml
geronimo/server/branches/sachin/assemblies/geronimo-framework/src/main/var/config/offline-deployer-list
- copied unchanged from r450525, geronimo/server/trunk/assemblies/geronimo-framework/src/main/var/config/offline-deployer-list
geronimo/server/branches/sachin/configs/jetty-deployer/src/main/
- copied from r450525, geronimo/server/trunk/configs/jetty-deployer/src/main/
geronimo/server/branches/sachin/configs/jetty-deployer/src/main/resources/
- copied from r450525, geronimo/server/trunk/configs/jetty-deployer/src/main/resources/
geronimo/server/branches/sachin/configs/jetty-deployer/src/main/resources/META-INF/
- copied from r450525, geronimo/server/trunk/configs/jetty-deployer/src/main/resources/META-INF/
geronimo/server/branches/sachin/configs/jetty-deployer/src/main/resources/META-INF/geronimo-plugin.xml
- copied unchanged from r450525, geronimo/server/trunk/configs/jetty-deployer/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/server/branches/sachin/configs/jetty/src/main/
- copied from r450525, geronimo/server/trunk/configs/jetty/src/main/
geronimo/server/branches/sachin/configs/jetty/src/main/resources/
- copied from r450525, geronimo/server/trunk/configs/jetty/src/main/resources/
geronimo/server/branches/sachin/configs/jetty/src/main/resources/META-INF/
- copied from r450525, geronimo/server/trunk/configs/jetty/src/main/resources/META-INF/
geronimo/server/branches/sachin/configs/jetty/src/main/resources/META-INF/geronimo-plugin.xml
- copied unchanged from r450525, geronimo/server/trunk/configs/jetty/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/server/branches/sachin/configs/tomcat-deployer/src/main/
- copied from r450525, geronimo/server/trunk/configs/tomcat-deployer/src/main/
geronimo/server/branches/sachin/configs/tomcat-deployer/src/main/resources/
- copied from r450525, geronimo/server/trunk/configs/tomcat-deployer/src/main/resources/
geronimo/server/branches/sachin/configs/tomcat-deployer/src/main/resources/META-INF/
- copied from r450525, geronimo/server/trunk/configs/tomcat-deployer/src/main/resources/META-INF/
geronimo/server/branches/sachin/configs/tomcat-deployer/src/main/resources/META-INF/geronimo-plugin.xml
- copied unchanged from r450525, geronimo/server/trunk/configs/tomcat-deployer/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/server/branches/sachin/configs/tomcat/src/main/
- copied from r450525, geronimo/server/trunk/configs/tomcat/src/main/
geronimo/server/branches/sachin/configs/tomcat/src/main/resources/
- copied from r450525, geronimo/server/trunk/configs/tomcat/src/main/resources/
geronimo/server/branches/sachin/configs/tomcat/src/main/resources/META-INF/
- copied from r450525, geronimo/server/trunk/configs/tomcat/src/main/resources/META-INF/
geronimo/server/branches/sachin/configs/tomcat/src/main/resources/META-INF/geronimo-plugin.xml
- copied unchanged from r450525, geronimo/server/trunk/configs/tomcat/src/main/resources/META-INF/geronimo-plugin.xml
geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/site/apt/usage/
- copied from r450525, geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/site/apt/usage/
geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/site/apt/usage/modules.apt
- copied unchanged from r450525, geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/site/apt/usage/modules.apt
geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/site/apt/usage/server.apt
- copied unchanged from r450525, geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/site/apt/usage/server.apt
geronimo/server/branches/sachin/modules/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/SchemaConversionTest.java
- copied unchanged from r450525, geronimo/server/trunk/modules/geronimo-client-builder/src/test/java/org/apache/geronimo/client/builder/SchemaConversionTest.java
geronimo/server/branches/sachin/modules/geronimo-client-builder/src/test/resources/j2ee_1_3dtd/
- copied from r450525, geronimo/server/trunk/modules/geronimo-client-builder/src/test/resources/j2ee_1_3dtd/
geronimo/server/branches/sachin/modules/geronimo-client-builder/src/test/resources/j2ee_1_3dtd/application-client-13.xml
- copied unchanged from r450525, geronimo/server/trunk/modules/geronimo-client-builder/src/test/resources/j2ee_1_3dtd/application-client-13.xml
geronimo/server/branches/sachin/modules/geronimo-client-builder/src/test/resources/j2ee_1_3dtd/application-client-14.xml
- copied unchanged from r450525, geronimo/server/trunk/modules/geronimo-client-builder/src/test/resources/j2ee_1_3dtd/application-client-14.xml
geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/SchemaConversionTest.java
- copied unchanged from r450525, geronimo/server/trunk/modules/geronimo-connector-builder/src/test/java/org/apache/geronimo/connector/deployment/SchemaConversionTest.java
geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/test/resources/j2ee_1_3dtd/
- copied from r450525, geronimo/server/trunk/modules/geronimo-connector-builder/src/test/resources/j2ee_1_3dtd/
geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/test/resources/j2ee_1_3dtd/ra-10.xml
- copied unchanged from r450525, geronimo/server/trunk/modules/geronimo-connector-builder/src/test/resources/j2ee_1_3dtd/ra-10.xml
geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/test/resources/j2ee_1_3dtd/ra-15.xml
- copied unchanged from r450525, geronimo/server/trunk/modules/geronimo-connector-builder/src/test/resources/j2ee_1_3dtd/ra-15.xml
Removed:
geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/site/apt/usage.apt
Modified:
geronimo/server/branches/sachin/NOTICE.txt
geronimo/server/branches/sachin/assemblies/pom.xml
geronimo/server/branches/sachin/configs/axis-deployer/src/plan/plan.xml
geronimo/server/branches/sachin/configs/j2ee-deployer/src/plan/plan.xml
geronimo/server/branches/sachin/configs/jetty-deployer/pom.xml
geronimo/server/branches/sachin/configs/jetty/pom.xml
geronimo/server/branches/sachin/configs/jetty/src/plan/plan.xml
geronimo/server/branches/sachin/configs/pom.xml
geronimo/server/branches/sachin/configs/tomcat-deployer/pom.xml
geronimo/server/branches/sachin/configs/tomcat/pom.xml
geronimo/server/branches/sachin/configs/tomcat/src/plan/plan.xml
geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/src/site/apt/usage.apt (contents, props changed)
geronimo/server/branches/sachin/maven-plugins/geronimo-deployment-plugin/src/site/apt/usage.apt (props changed)
geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/pom.xml
geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/site/site.xml
geronimo/server/branches/sachin/maven-plugins/selenium-maven-plugin/src/site/apt/usage.apt (contents, props changed)
geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java
geronimo/server/branches/sachin/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/main/java/org/apache/geronimo/schema/SchemaConversionUtils.java
geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
geronimo/server/branches/sachin/modules/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilder.java
geronimo/server/branches/sachin/modules/geronimo-naming-builder/src/test/java/org/apache/geronimo/naming/deployment/EnvironmentEntryBuilderTest.java
geronimo/server/branches/sachin/modules/geronimo-security/src/main/java/org/apache/geronimo/security/jaas/DirectConfigurationEntry.java
geronimo/server/branches/sachin/modules/geronimo-security/src/main/java/org/apache/geronimo/security/keystore/FileKeystoreInstance.java
geronimo/server/branches/sachin/modules/geronimo-security/src/test/java/org/apache/geronimo/security/jaas/LoginPropertiesFileTest.java
geronimo/server/branches/sachin/pom.xml
Modified: geronimo/server/branches/sachin/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/NOTICE.txt?view=diff&rev=450537&r1=450536&r2=450537
==============================================================================
--- geronimo/server/branches/sachin/NOTICE.txt (original)
+++ geronimo/server/branches/sachin/NOTICE.txt Wed Sep 27 11:22:17 2006
@@ -1,3 +1,6 @@
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
Portions of the Web Console were orginally developed by
International Business Machines Corporation and are
licensed to the Apache Software Foundation under the
Modified: geronimo/server/branches/sachin/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/assemblies/pom.xml?view=diff&rev=450537&r1=450536&r2=450537
==============================================================================
--- geronimo/server/branches/sachin/assemblies/pom.xml (original)
+++ geronimo/server/branches/sachin/assemblies/pom.xml Wed Sep 27 11:22:17 2006
@@ -64,6 +64,7 @@
<modules>
<module>geronimo-boilerplate-minimal</module>
<module>geronimo-boilerplate-j2ee</module>
+ <module>geronimo-framework</module>
<module>geronimo-jetty-j2ee</module>
<module>geronimo-jetty-minimal</module>
<module>geronimo-tomcat-j2ee</module>
Modified: geronimo/server/branches/sachin/configs/axis-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/axis-deployer/src/plan/plan.xml?view=diff&rev=450537&r1=450536&r2=450537
==============================================================================
--- geronimo/server/branches/sachin/configs/axis-deployer/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/axis-deployer/src/plan/plan.xml Wed Sep 27 11:22:17 2006
@@ -20,6 +20,7 @@
<gbean name="WebServiceBuilder" class="org.apache.geronimo.axis.builder.AxisBuilder"/>
<gbean name="AxisServiceRefBuilder" class="org.apache.geronimo.axis.builder.AxisServiceRefBuilder">
+ <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
<xml-attribute name="defaultEnvironment">
<environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
<dependencies>
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?view=diff&rev=450537&r1=450536&r2=450537
==============================================================================
--- geronimo/server/branches/sachin/configs/j2ee-deployer/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/j2ee-deployer/src/plan/plan.xml Wed Sep 27 11:22:17 2006
@@ -129,6 +129,8 @@
<gbean name="GBeanRefBuilder" class="org.apache.geronimo.naming.deployment.GBeanRefBuilder"/>
<gbean name="PersistenceContextRefBuilder" class="org.apache.geronimo.naming.deployment.PersistenceContextRefBuilder"/>
- <gbean name="EnvironmentEntryBuilder" class="org.apache.geronimo.naming.deployment.EnvironmentEntryBuilder"/>
+ <gbean name="EnvironmentEntryBuilder" class="org.apache.geronimo.naming.deployment.EnvironmentEntryBuilder">
+ <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee</attribute>
+ </gbean>
</module>
Modified: geronimo/server/branches/sachin/configs/jetty-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/jetty-deployer/pom.xml?view=diff&rev=450537&r1=450536&r2=450537
==============================================================================
--- geronimo/server/branches/sachin/configs/jetty-deployer/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/jetty-deployer/pom.xml Wed Sep 27 11:22:17 2006
@@ -66,4 +66,26 @@
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${pom.basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <configuration>
+ <deploymentConfigs>
+ <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+ <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+ </deploymentConfigs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/server/branches/sachin/configs/jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/jetty/pom.xml?view=diff&rev=450537&r1=450536&r2=450537
==============================================================================
--- geronimo/server/branches/sachin/configs/jetty/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/jetty/pom.xml Wed Sep 27 11:22:17 2006
@@ -70,4 +70,26 @@
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${pom.basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <configuration>
+ <deploymentConfigs>
+ <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+ <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+ </deploymentConfigs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/server/branches/sachin/configs/jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/jetty/src/plan/plan.xml?view=diff&rev=450537&r1=450536&r2=450537
==============================================================================
--- geronimo/server/branches/sachin/configs/jetty/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/jetty/src/plan/plan.xml Wed Sep 27 11:22:17 2006
@@ -72,7 +72,7 @@
<gbean name="JettyAJP13Connector" class="org.apache.geronimo.jetty.connector.AJP13Connector">
<attribute name="host">${PlanServerHostname}</attribute>
- <attribute name="port">${PlanAJPPort2}</attribute>
+ <attribute name="port">${PlanAJPPort}</attribute>
<reference name="JettyContainer">
<name>JettyWebContainer</name>
</reference>
Modified: geronimo/server/branches/sachin/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/pom.xml?view=diff&rev=450537&r1=450536&r2=450537
==============================================================================
--- geronimo/server/branches/sachin/configs/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/pom.xml Wed Sep 27 11:22:17 2006
@@ -50,13 +50,11 @@
<jettyDeployer>org.apache.geronimo.configs/jetty-deployer/${pom.version}/car</jettyDeployer>
<!-- Common plan properties -->
- <PlanServerHostname>localhost</PlanServerHostname>
+ <PlanServerHostname>0.0.0.0</PlanServerHostname>
<PlanClientAddresses>127.0.0.1</PlanClientAddresses>
<PlanHTTPPort>8080</PlanHTTPPort>
<PlanHTTPSPort>8443</PlanHTTPSPort>
- <PlanHTTPPort2>8090</PlanHTTPPort2>
- <PlanHTTPSPort2>8453</PlanHTTPSPort2>
- <PlanAJPPort2>8019</PlanAJPPort2>
+ <PlanAJPPort>8019</PlanAJPPort>
<PlanOpenEJBPort>4201</PlanOpenEJBPort>
<PlanRemoteLoginPort>4242</PlanRemoteLoginPort>
<PlanNamingPort>1099</PlanNamingPort>
Modified: geronimo/server/branches/sachin/configs/tomcat-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/tomcat-deployer/pom.xml?view=diff&rev=450537&r1=450536&r2=450537
==============================================================================
--- geronimo/server/branches/sachin/configs/tomcat-deployer/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/tomcat-deployer/pom.xml Wed Sep 27 11:22:17 2006
@@ -67,6 +67,13 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>${pom.basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
<groupId>org.apache.geronimo.plugins</groupId>
Modified: geronimo/server/branches/sachin/configs/tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/tomcat/pom.xml?view=diff&rev=450537&r1=450536&r2=450537
==============================================================================
--- geronimo/server/branches/sachin/configs/tomcat/pom.xml (original)
+++ geronimo/server/branches/sachin/configs/tomcat/pom.xml Wed Sep 27 11:22:17 2006
@@ -63,4 +63,26 @@
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>${pom.basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <configuration>
+ <deploymentConfigs>
+ <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+ <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+ </deploymentConfigs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/server/branches/sachin/configs/tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/configs/tomcat/src/plan/plan.xml?view=diff&rev=450537&r1=450536&r2=450537
==============================================================================
--- geronimo/server/branches/sachin/configs/tomcat/src/plan/plan.xml (original)
+++ geronimo/server/branches/sachin/configs/tomcat/src/plan/plan.xml Wed Sep 27 11:22:17 2006
@@ -52,13 +52,13 @@
<gbean name="TomcatWebConnector" class="org.apache.geronimo.tomcat.ConnectorGBean">
<attribute name="name">HTTP</attribute>
<attribute name="host">${PlanServerHostname}</attribute>
- <attribute name="port">${PlanHTTPPort2}</attribute>
+ <attribute name="port">${PlanHTTPPort}</attribute>
<attribute name="maxHttpHeaderSizeBytes">8192</attribute>
<attribute name="maxThreads">150</attribute>
<attribute name="minSpareThreads">25</attribute>
<attribute name="maxSpareThreads">75</attribute>
<attribute name="hostLookupEnabled">false</attribute>
- <attribute name="redirectPort">${PlanHTTPSPort2}</attribute>
+ <attribute name="redirectPort">${PlanHTTPSPort}</attribute>
<attribute name="acceptQueueSize">100</attribute>
<attribute name="connectionTimeoutMillis">20000</attribute>
<attribute name="uploadTimeoutEnabled">false</attribute>
@@ -71,9 +71,9 @@
<attribute name="protocol">AJP</attribute>
<attribute name="name">AJP</attribute>
<attribute name="host">${PlanServerHostname}</attribute>
- <attribute name="port">${PlanAJPPort2}</attribute>
+ <attribute name="port">${PlanAJPPort}</attribute>
<attribute name="hostLookupEnabled">false</attribute>
- <attribute name="redirectPort">${PlanHTTPSPort2}</attribute>
+ <attribute name="redirectPort">${PlanHTTPSPort}</attribute>
<reference name="TomcatContainer">
<name>TomcatWebContainer</name>
</reference>
@@ -85,7 +85,7 @@
<gbean name="TomcatWebSSLConnector" class="org.apache.geronimo.tomcat.HttpsConnectorGBean">
<attribute name="name">HTTPS</attribute>
<attribute name="host">${PlanServerHostname}</attribute>
- <attribute name="port">${PlanHTTPSPort2}</attribute>
+ <attribute name="port">${PlanHTTPSPort}</attribute>
<attribute name="maxHttpHeaderSizeBytes">8192</attribute>
<attribute name="maxThreads">150</attribute>
<attribute name="minSpareThreads">25</attribute>
Modified: geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/src/site/apt/usage.apt?view=diff&rev=450537&r1=450536&r2=450537
==============================================================================
--- geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/src/site/apt/usage.apt (original)
+++ geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/src/site/apt/usage.apt Wed Sep 27 11:22:17 2006
@@ -1,180 +1,198 @@
- ------
- Geronimo CAR Plugin for Maven 2
- ------
- ???
- ------
- ???
-
-Basic Usage
-
-* Setup Plugin Repository
-
-+----------+
-<project>
- ...
- <pluginRepositories>
- <pluginRepository>
- <id>apache-snapshots</id>
- <name>Apache Snapshots Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository</url>
- <layout>default</layout>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- ...
- </pluginRepositories>
- ...
-</project>
-+----------+
-
-* Define Dependency as Extention
-
- Install as extention to allow 'car' packaging to be used.
-
-+----------+
-<project>
- ...
- <packaging>car</packaging>
- ...
- <build>
- ...
- <plugins>
- ...
- <plugin>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <extensions>true</extensions>
- </plugin>
- </plugins>
- ...
- </build>
- ...
-</project>
-+----------+
-
-* CAR with Class-Path and Main-Class manifest entries
-
- NOTE: The list of classpath elements is non-transitive.
-
-+----------+
-<project>
- ...
- <packaging>car</packaging>
- ...
- <build>
- ...
- <plugins>
- ...
- <plugin>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Endorsed-Dirs>lib/endorsed</Endorsed-Dirs>
- <Extension-Dirs>lib/ext</Extension-Dirs>
- </manifestEntries>
- <manifest>
- <mainClass>org.apache.geronimo.system.main.Daemon</mainClass>
- </manifest>
- </archive>
- <classpath>
- <classpathElement>
- <groupId>mx4j</groupId>
- <artifactId>mx4j</artifactId>
- </classpathElement>
- <classpathElement>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-remote</artifactId>
- </classpathElement>
- <classpathElement>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </classpathElement>
- <classpathElement>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </classpathElement>
- <classpathElement>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- </classpathElement>
- <classpathElement>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </classpathElement>
- <classpathElement>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- </classpathElement>
- <classpathElement>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- </classpathElement>
- <classpathElement>
- <groupId>xstream</groupId>
- <artifactId>xstream</artifactId>
- </classpathElement>
- <classpathElement>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </classpathElement>
- <classpathElement>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <classpathPrefix>../lib/endorsed</classpathPrefix>
- </classpathElement>
- <classpathElement>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <classpathPrefix>../lib/endorsed</classpathPrefix>
- </classpathElement>
- </classpath>
- <classpathPrefix>../lib</classpathPrefix>
- </configuration>
- </plugin>
- ...
- </plugins>
- ...
- </build>
- ...
-<project>
-+----------+
-
-* Install artifacts into a Geronimo repository
-
- Install arbitrary artifacts into a Geronimo repository.
-
-+----------+
-<plugin>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>install-repository</id>
- <phase>compile</phase>
- <goals>
- <goal>install-artifacts</goal>
- </goals>
- <configuration>
- <repositoryDirectory>${project.build.outputDirectory}/repository</repositoryDirectory>
-
- <artifacts>
- <artifactItem>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>ge-activemq-rar</artifactId>
- <type>rar</type>
- </artifactItem>
- </artifacts>
- </configuration>
- </execution>
- </executions>
-</plugin>
-+----------+
-
+ ------
+ Basic Usage :: Geronimo CAR Plugin for Maven 2
+ ------
+ ------
+ $Rev$ $Date$
+
+~~
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+~~
+
+Basic Usage
+
+* Setup Plugin Repository
+
++----------+
+<project>
+ ...
+ <pluginRepositories>
+ <pluginRepository>
+ <id>apache-snapshots</id>
+ <name>Apache Snapshots Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>daily</updatePolicy>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+ ...
+ </pluginRepositories>
+ ...
+</project>
++----------+
+
+* Define Dependency as Extention
+
+ Install as extention to allow 'car' packaging to be used.
+
++----------+
+<project>
+ ...
+ <packaging>car</packaging>
+ ...
+ <build>
+ ...
+ <plugins>
+ ...
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ ...
+ </build>
+ ...
+</project>
++----------+
+
+* CAR with Class-Path and Main-Class manifest entries
+
+ NOTE: The list of classpath elements is non-transitive.
+
++----------+
+<project>
+ ...
+ <packaging>car</packaging>
+ ...
+ <build>
+ ...
+ <plugins>
+ ...
+ <plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Endorsed-Dirs>lib/endorsed</Endorsed-Dirs>
+ <Extension-Dirs>lib/ext</Extension-Dirs>
+ </manifestEntries>
+ <manifest>
+ <mainClass>org.apache.geronimo.system.main.Daemon</mainClass>
+ </manifest>
+ </archive>
+ <classpath>
+ <classpathElement>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
+ </classpathElement>
+ <classpathElement>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-remote</artifactId>
+ </classpathElement>
+ <classpathElement>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </classpathElement>
+ <classpathElement>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </classpathElement>
+ <classpathElement>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ </classpathElement>
+ <classpathElement>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </classpathElement>
+ <classpathElement>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </classpathElement>
+ <classpathElement>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3</artifactId>
+ </classpathElement>
+ <classpathElement>
+ <groupId>xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </classpathElement>
+ <classpathElement>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ </classpathElement>
+ <classpathElement>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <classpathPrefix>../lib/endorsed</classpathPrefix>
+ </classpathElement>
+ <classpathElement>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <classpathPrefix>../lib/endorsed</classpathPrefix>
+ </classpathElement>
+ </classpath>
+ <classpathPrefix>../lib</classpathPrefix>
+ </configuration>
+ </plugin>
+ ...
+ </plugins>
+ ...
+ </build>
+ ...
+<project>
++----------+
+
+* Install artifacts into a Geronimo repository
+
+ Install arbitrary artifacts into a Geronimo repository.
+
++----------+
+<plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install-repository</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>install-artifacts</goal>
+ </goals>
+ <configuration>
+ <repositoryDirectory>${project.build.outputDirectory}/repository</repositoryDirectory>
+
+ <artifacts>
+ <artifactItem>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>ge-activemq-rar</artifactId>
+ <type>rar</type>
+ </artifactItem>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+</plugin>
++----------+
+
Propchange: geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/src/site/apt/usage.apt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/src/site/apt/usage.apt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/branches/sachin/maven-plugins/car-maven-plugin/src/site/apt/usage.apt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: geronimo/server/branches/sachin/maven-plugins/geronimo-deployment-plugin/src/site/apt/usage.apt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/branches/sachin/maven-plugins/geronimo-deployment-plugin/src/site/apt/usage.apt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/branches/sachin/maven-plugins/geronimo-deployment-plugin/src/site/apt/usage.apt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/pom.xml?view=diff&rev=450537&r1=450536&r2=450537
==============================================================================
--- geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/pom.xml (original)
+++ geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/pom.xml Wed Sep 27 11:22:17 2006
@@ -36,7 +36,8 @@
<packaging>maven-plugin</packaging>
<description>
- Geronimo plugin for Maven 2; used to install, start and stop the server.
+ Geronimo plugin for Maven 2; used to install, start, stop the server
+ and operate on modules.
</description>
<dependencies>
Modified: geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/site/site.xml?view=diff&rev=450537&r1=450536&r2=450537
==============================================================================
--- geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/site/site.xml (original)
+++ geronimo/server/branches/sachin/maven-plugins/geronimo-maven-plugin/src/site/site.xml Wed Sep 27 11:22:17 2006
@@ -1,18 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2006 The Apache Software Foundation
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
-->
<!-- $Id$ -->
@@ -27,8 +30,12 @@
<menu name="${project.name}">
<item name="Overview" href="index.html"/>
- <item name="Usage" href="usage.html"/>
<item name="Configuration" href="plugin-info.html"/>
+ </menu>
+
+ <menu name="Usage">
+ <item name="Server Goals" href="usage/server.html"/>
+ <item name="Module Goals" href="usage/modules.html"/>
</menu>
${reports}
Modified: geronimo/server/branches/sachin/maven-plugins/selenium-maven-plugin/src/site/apt/usage.apt
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/maven-plugins/selenium-maven-plugin/src/site/apt/usage.apt?view=diff&rev=450537&r1=450536&r2=450537
==============================================================================
--- geronimo/server/branches/sachin/maven-plugins/selenium-maven-plugin/src/site/apt/usage.apt (original)
+++ geronimo/server/branches/sachin/maven-plugins/selenium-maven-plugin/src/site/apt/usage.apt Wed Sep 27 11:22:17 2006
@@ -1,62 +1,80 @@
- ------
- Geronimo Selenium Plugin for Maven 2
- ------
- ???
- ------
- ???
-
-Basic Usage
-
-* Start Selenium Server (Integrated)
-
- For integration tests that need a Selenium server, use the <<<pre-integration-test>>>
- phase to start it up in the <background> to allow the <<<integration-test>>> phase to
- be executed with the server running.
-
- <<NOTE:>> Currently there is no <stop>, the forked JVM will exit when Maven does.
-
- This will by default create files under <<<$\{pom.basedir\}/target/selenium>>>, including:
-
- * <<<server.out>>>
-
- * <<<server.err>>>
-
- * <<<server.log>>>
-
- * <<<user-extensions.js>>> (if enabled)
-
-+----------+
-<plugin>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>start-selenium</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start</goal>
- </goals>
- <configuration>
- <background>true</background>
- </configuration>
- </execution>
- </executions>
-</plugin>
-+----------+
-
-* Start Selenium Server (Standalone)
-
- To start Selenium on the command line, which is very useful while developing tests,
- simply execute the <<<start>>> goal.
-
- This will start the server and block until the server has been stopped, either
- from the process being killed, or more normally, until CTRL-C is used to exit
- Maven.
-
- This is the preferred mechanism to start the server standalone, as it will setup
- <<<user-extensions.js>>>.
-
-+----------+
-mvn selenium:start
-+----------+
-
+ ------
+ Basic Usage :: Geronimo Selenium Plugin for Maven 2
+ ------
+ ------
+ $Rev$ $Date$
+
+~~
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+~~
+
+Basic Usage
+
+* Start Selenium Server (Integrated)
+
+ For integration tests that need a Selenium server, use the <<<pre-integration-test>>>
+ phase to start it up in the <background> to allow the <<<integration-test>>> phase to
+ be executed with the server running.
+
+ <<NOTE:>> Currently there is no <stop>, the forked JVM will exit when Maven does.
+
+ This will by default create files under <<<$\{pom.basedir\}/target/selenium>>>, including:
+
+ * <<<server.out>>>
+
+ * <<<server.err>>>
+
+ * <<<server.log>>>
+
+ * <<<user-extensions.js>>> (if enabled)
+
++----------+
+<plugin>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>start-selenium</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ <configuration>
+ <background>true</background>
+ </configuration>
+ </execution>
+ </executions>
+</plugin>
++----------+
+
+* Start Selenium Server (Standalone)
+
+ To start Selenium on the command line, which is very useful while developing tests,
+ simply execute the <<<start>>> goal.
+
+ This will start the server and block until the server has been stopped, either
+ from the process being killed, or more normally, until CTRL-C is used to exit
+ Maven.
+
+ This is the preferred mechanism to start the server standalone, as it will setup
+ <<<user-extensions.js>>>.
+
++----------+
+mvn selenium:start
++----------+
+
Propchange: geronimo/server/branches/sachin/maven-plugins/selenium-maven-plugin/src/site/apt/usage.apt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/server/branches/sachin/maven-plugins/selenium-maven-plugin/src/site/apt/usage.apt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/server/branches/sachin/maven-plugins/selenium-maven-plugin/src/site/apt/usage.apt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java?view=diff&rev=450537&r1=450536&r2=450537
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisServiceRefBuilder.java Wed Sep 27 11:22:17 2006
@@ -49,20 +49,19 @@
import org.apache.xmlbeans.XmlObject;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class AxisServiceRefBuilder extends AbstractNamingBuilder {
- private static final String J2EE_NAMESPACE = "http://java.sun.com/xml/ns/j2ee";
- private static final QName SERVICE_REF_QNAME = new QName(J2EE_NAMESPACE, "service-ref");
- private static final QNameSet SERVICE_REF_QNAME_SET = QNameSet.singleton(SERVICE_REF_QNAME);
+ private final QNameSet serviceRefQNameSet;
private static final QName GER_SERVICE_REF_QNAME = GerServiceRefDocument.type.getDocumentElementName();
private static final QNameSet GER_SERVICE_REF_QNAME_SET = QNameSet.singleton(GER_SERVICE_REF_QNAME);
private final AxisBuilder axisBuilder;
- public AxisServiceRefBuilder(Environment defaultEnvironment, AxisBuilder axisBuilder) {
+ public AxisServiceRefBuilder(Environment defaultEnvironment, String[] eeNamespaces, AxisBuilder axisBuilder) {
super(defaultEnvironment);
this.axisBuilder = axisBuilder;
+ serviceRefQNameSet = buildQNameSet(eeNamespaces, "service-ref");
}
protected boolean willMergeEnvironment(XmlObject specDD, XmlObject plan) {
@@ -136,12 +135,11 @@
}
private XmlObject[] getServiceRefs(XmlObject specDD) {
- XmlObject[] serviceRefsUntyped = specDD.selectChildren(SERVICE_REF_QNAME_SET);
- return serviceRefsUntyped;
+ return convert(specDD.selectChildren(serviceRefQNameSet), J2EE_CONVERTER, ServiceRefType.type);
}
public QNameSet getSpecQNameSet() {
- return SERVICE_REF_QNAME_SET;
+ return serviceRefQNameSet;
}
public QNameSet getPlanQNameSet() {
@@ -210,9 +208,10 @@
static {
GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(AxisServiceRefBuilder.class, NameFactory.MODULE_BUILDER);
infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
+ infoBuilder.addAttribute("eeNamespaces", String[].class, true, true);
infoBuilder.addReference("AxisBuilder", AxisBuilder.class, NameFactory.MODULE_BUILDER);
- infoBuilder.setConstructor(new String[] {"defaultEnvironment", "AxisBuilder"});
+ infoBuilder.setConstructor(new String[] {"defaultEnvironment", "eeNamespaces", "AxisBuilder"});
GBEAN_INFO = infoBuilder.getBeanInfo();
}
Modified: geronimo/server/branches/sachin/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?view=diff&rev=450537&r1=450536&r2=450537
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-client-builder/src/main/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Wed Sep 27 11:22:17 2006
@@ -84,6 +84,7 @@
import org.apache.geronimo.xbeans.j2ee.ApplicationClientType;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
+import org.apache.xmlbeans.XmlCursor;
/**
@@ -216,7 +217,7 @@
try {
// parse it
XmlObject xmlObject = XmlBeansUtil.parse(specDD);
- ApplicationClientDocument appClientDoc = SchemaConversionUtils.convertToApplicationClientSchema(xmlObject);
+ ApplicationClientDocument appClientDoc = convertToApplicationClientSchema(xmlObject);
appClient = appClientDoc.getApplicationClient();
} catch (XmlException e) {
throw new DeploymentException("Unable to parse application-client.xml", e);
@@ -367,6 +368,35 @@
// geronimoAppClient.setConfigId(id);
// }
return geronimoAppClient;
+ }
+
+ static ApplicationClientDocument convertToApplicationClientSchema(XmlObject xmlObject) throws XmlException {
+ if (ApplicationClientDocument.type.equals(xmlObject.schemaType())) {
+ XmlBeansUtil.validateDD(xmlObject);
+ return (ApplicationClientDocument) xmlObject;
+ }
+ XmlCursor cursor = xmlObject.newCursor();
+ XmlCursor moveable = xmlObject.newCursor();
+ String schemaLocationURL = "http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd";
+ String version = "1.4";
+ try {
+ SchemaConversionUtils.convertToSchema(cursor, SchemaConversionUtils.J2EE_NAMESPACE, schemaLocationURL, version);
+ cursor.toStartDoc();
+ cursor.toChild(SchemaConversionUtils.J2EE_NAMESPACE, "application-client");
+ cursor.toFirstChild();
+ SchemaConversionUtils.convertToDescriptionGroup(SchemaConversionUtils.J2EE_NAMESPACE, cursor, moveable);
+ } finally {
+ cursor.dispose();
+ moveable.dispose();
+ }
+ XmlObject result = xmlObject.changeType(ApplicationClientDocument.type);
+ if (result != null) {
+ XmlBeansUtil.validateDD(result);
+ return (ApplicationClientDocument) result;
+ }
+ XmlBeansUtil.validateDD(xmlObject);
+ return (ApplicationClientDocument) xmlObject;
+
}
public void installModule(JarFile earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repositories) throws DeploymentException {
Modified: geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?view=diff&rev=450537&r1=450536&r2=450537
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-connector-builder/src/main/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Wed Sep 27 11:22:17 2006
@@ -61,7 +61,9 @@
import org.apache.geronimo.connector.outbound.connectionmanagerconfig.TransactionLog;
import org.apache.geronimo.connector.outbound.connectionmanagerconfig.TransactionSupport;
import org.apache.geronimo.connector.outbound.connectionmanagerconfig.XATransactions;
-import org.apache.geronimo.deployment.*;
+import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.NamespaceDrivenBuilder;
+import org.apache.geronimo.deployment.NamespaceDrivenBuilderCollection;
import org.apache.geronimo.deployment.service.EnvironmentBuilder;
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.deployment.xbeans.EnvironmentType;
@@ -74,11 +76,11 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.InvalidConfigurationException;
+import org.apache.geronimo.j2ee.deployment.ActivationSpecInfoLocator;
import org.apache.geronimo.j2ee.deployment.ConnectorModule;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.deployment.Module;
import org.apache.geronimo.j2ee.deployment.ModuleBuilder;
-import org.apache.geronimo.j2ee.deployment.ActivationSpecInfoLocator;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
import org.apache.geronimo.kernel.GBeanNotFoundException;
@@ -113,6 +115,7 @@
import org.apache.geronimo.xbeans.j2ee.MessagelistenerType;
import org.apache.geronimo.xbeans.j2ee.ResourceadapterType;
import org.apache.xmlbeans.XmlCursor;
+import org.apache.xmlbeans.XmlDocumentProperties;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
@@ -131,6 +134,7 @@
private final boolean defaultXAThreadCaching;
private final Environment defaultEnvironment;
private final NamespaceDrivenBuilderCollection serviceBuilders;
+ private static final QName RESOURCE_ADAPTER_VERSION = new QName(SchemaConversionUtils.J2EE_NAMESPACE, "resourceadapter-version");
public ConnectorModuleBuilder(Environment defaultEnvironment,
int defaultMaxSize,
@@ -182,7 +186,7 @@
try {
// parse it
XmlObject xmlObject = XmlBeansUtil.parse(specDD);
- ConnectorDocument connectorDoc = SchemaConversionUtils.convertToConnectorSchema(xmlObject);
+ ConnectorDocument connectorDoc = convertToConnectorSchema(xmlObject);
connector = connectorDoc.getConnector();
} catch (XmlException e) {
throw new DeploymentException("Could not parse ra.xml descriptor", e);
@@ -257,6 +261,77 @@
return new ConnectorModule(standAlone, moduleName, environment, moduleFile, targetPath, connector, gerConnector, specDD);
}
+ static ConnectorDocument convertToConnectorSchema(XmlObject xmlObject) throws XmlException {
+ if (ConnectorDocument.type.equals(xmlObject.schemaType())) {
+ XmlBeansUtil.validateDD(xmlObject);
+ return (ConnectorDocument) xmlObject;
+ }
+ XmlCursor cursor = xmlObject.newCursor();
+ XmlDocumentProperties xmlDocumentProperties = cursor.documentProperties();
+ String publicId = xmlDocumentProperties.getDoctypePublicId();
+ try {
+ if ("-//Sun Microsystems, Inc.//DTD Connector 1.0//EN".equals(publicId)) {
+ XmlCursor moveable = xmlObject.newCursor();
+ try {
+ String schemaLocationURL = "http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd";
+ String version = "1.5";
+ SchemaConversionUtils.convertToSchema(cursor, SchemaConversionUtils.J2EE_NAMESPACE, schemaLocationURL, version);
+ cursor.toStartDoc();
+ cursor.toChild(SchemaConversionUtils.J2EE_NAMESPACE, "connector");
+ cursor.toFirstChild();
+ SchemaConversionUtils.convertToDescriptionGroup(SchemaConversionUtils.J2EE_NAMESPACE, cursor, moveable);
+ cursor.toNextSibling(SchemaConversionUtils.J2EE_NAMESPACE, "spec-version");
+ cursor.removeXml();
+ cursor.toNextSibling(SchemaConversionUtils.J2EE_NAMESPACE, "version");
+ cursor.setName(RESOURCE_ADAPTER_VERSION);
+ cursor.toNextSibling(SchemaConversionUtils.J2EE_NAMESPACE, "resourceadapter");
+ moveable.toCursor(cursor);
+ cursor.toFirstChild();
+ cursor.beginElement("outbound-resourceadapter", SchemaConversionUtils.J2EE_NAMESPACE);
+ cursor.beginElement("connection-definition", SchemaConversionUtils.J2EE_NAMESPACE);
+ moveable.toChild(SchemaConversionUtils.J2EE_NAMESPACE, "managedconnectionfactory-class");
+ moveable.push();
+ //from moveable to cursor
+ moveable.moveXml(cursor);
+ while (moveable.toNextSibling(SchemaConversionUtils.J2EE_NAMESPACE, "config-property")) {
+ moveable.moveXml(cursor);
+ }
+ moveable.pop();
+ moveable.toNextSibling(SchemaConversionUtils.J2EE_NAMESPACE, "connectionfactory-interface");
+ moveable.moveXml(cursor);
+ moveable.toNextSibling(SchemaConversionUtils.J2EE_NAMESPACE, "connectionfactory-impl-class");
+ moveable.moveXml(cursor);
+ moveable.toNextSibling(SchemaConversionUtils.J2EE_NAMESPACE, "connection-interface");
+ moveable.moveXml(cursor);
+ moveable.toNextSibling(SchemaConversionUtils.J2EE_NAMESPACE, "connection-impl-class");
+ moveable.moveXml(cursor);
+ //get out of connection-definition element
+ cursor.toNextToken();
+ moveable.toNextSibling(SchemaConversionUtils.J2EE_NAMESPACE, "transaction-support");
+ moveable.moveXml(cursor);
+ while (moveable.toNextSibling(SchemaConversionUtils.J2EE_NAMESPACE, "authentication-mechanism")) {
+ moveable.moveXml(cursor);
+ }
+ moveable.toNextSibling(SchemaConversionUtils.J2EE_NAMESPACE, "reauthentication-support");
+ moveable.moveXml(cursor);
+ } finally {
+ moveable.dispose();
+ }
+
+ }
+ } finally {
+ cursor.dispose();
+ }
+ XmlObject result = xmlObject.changeType(ConnectorDocument.type);
+ if (result != null) {
+ XmlBeansUtil.validateDD(result);
+ return (ConnectorDocument) result;
+ }
+ XmlBeansUtil.validateDD(xmlObject);
+ return (ConnectorDocument) xmlObject;
+
+ }
+
public void installModule(DeployableModule earFile, EARContext earContext, Module module, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws DeploymentException {
try {
DeployableModule moduleFile = module.getModuleFile();
@@ -891,4 +966,5 @@
public static GBeanInfo getGBeanInfo() {
return GBEAN_INFO;
}
+
}
Modified: geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/main/java/org/apache/geronimo/schema/SchemaConversionUtils.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/main/java/org/apache/geronimo/schema/SchemaConversionUtils.java?view=diff&rev=450537&r1=450536&r2=450537
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/main/java/org/apache/geronimo/schema/SchemaConversionUtils.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/main/java/org/apache/geronimo/schema/SchemaConversionUtils.java Wed Sep 27 11:22:17 2006
@@ -45,9 +45,6 @@
private static final String GERONIMO_SECURITY_NAMESPACE = "http://geronimo.apache.org/xml/ns/security-1.2";
private static final String GERONIMO_SERVICE_NAMESPACE = "http://geronimo.apache.org/xml/ns/deployment-1.2";
- private static final QName RESOURCE_ADAPTER_VERSION = new QName(J2EE_NAMESPACE, "resourceadapter-version");
- private static final QName CMP_VERSION = new QName(J2EE_NAMESPACE, "cmp-version");
-
private static final Map GERONIMO_SCHEMA_CONVERSIONS = new HashMap();
static {
@@ -80,151 +77,6 @@
GERONIMO_SCHEMA_CONVERSIONS.putAll(conversions);
}
- public static ApplicationClientDocument convertToApplicationClientSchema(XmlObject xmlObject) throws XmlException {
- if (ApplicationClientDocument.type.equals(xmlObject.schemaType())) {
- XmlBeansUtil.validateDD(xmlObject);
- return (ApplicationClientDocument) xmlObject;
- }
- XmlCursor cursor = xmlObject.newCursor();
- XmlCursor moveable = xmlObject.newCursor();
- String schemaLocationURL = "http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd";
- String version = "1.4";
- try {
- convertToSchema(cursor, J2EE_NAMESPACE, schemaLocationURL, version);
- cursor.toStartDoc();
- cursor.toChild(J2EE_NAMESPACE, "application-client");
- cursor.toFirstChild();
- convertToDescriptionGroup(J2EE_NAMESPACE, cursor, moveable);
- } finally {
- cursor.dispose();
- moveable.dispose();
- }
- XmlObject result = xmlObject.changeType(ApplicationClientDocument.type);
- if (result != null) {
- XmlBeansUtil.validateDD(result);
- return (ApplicationClientDocument) result;
- }
- XmlBeansUtil.validateDD(xmlObject);
- return (ApplicationClientDocument) xmlObject;
-
- }
-
- public static ConnectorDocument convertToConnectorSchema(XmlObject xmlObject) throws XmlException {
- if (ConnectorDocument.type.equals(xmlObject.schemaType())) {
- XmlBeansUtil.validateDD(xmlObject);
- return (ConnectorDocument) xmlObject;
- }
- XmlCursor cursor = xmlObject.newCursor();
- XmlDocumentProperties xmlDocumentProperties = cursor.documentProperties();
- String publicId = xmlDocumentProperties.getDoctypePublicId();
- try {
- if ("-//Sun Microsystems, Inc.//DTD Connector 1.0//EN".equals(publicId)) {
- XmlCursor moveable = xmlObject.newCursor();
- try {
- String schemaLocationURL = "http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd";
- String version = "1.5";
- convertToSchema(cursor, J2EE_NAMESPACE, schemaLocationURL, version);
- cursor.toStartDoc();
- cursor.toChild(J2EE_NAMESPACE, "connector");
- cursor.toFirstChild();
- convertToDescriptionGroup(J2EE_NAMESPACE, cursor, moveable);
- cursor.toNextSibling(J2EE_NAMESPACE, "spec-version");
- cursor.removeXml();
- cursor.toNextSibling(J2EE_NAMESPACE, "version");
- cursor.setName(RESOURCE_ADAPTER_VERSION);
- cursor.toNextSibling(J2EE_NAMESPACE, "resourceadapter");
- moveable.toCursor(cursor);
- cursor.toFirstChild();
- cursor.beginElement("outbound-resourceadapter", J2EE_NAMESPACE);
- cursor.beginElement("connection-definition", J2EE_NAMESPACE);
- moveable.toChild(J2EE_NAMESPACE, "managedconnectionfactory-class");
- moveable.push();
- //from moveable to cursor
- moveable.moveXml(cursor);
- while (moveable.toNextSibling(J2EE_NAMESPACE, "config-property")) {
- moveable.moveXml(cursor);
- }
- moveable.pop();
- moveable.toNextSibling(J2EE_NAMESPACE, "connectionfactory-interface");
- moveable.moveXml(cursor);
- moveable.toNextSibling(J2EE_NAMESPACE, "connectionfactory-impl-class");
- moveable.moveXml(cursor);
- moveable.toNextSibling(J2EE_NAMESPACE, "connection-interface");
- moveable.moveXml(cursor);
- moveable.toNextSibling(J2EE_NAMESPACE, "connection-impl-class");
- moveable.moveXml(cursor);
- //get out of connection-definition element
- cursor.toNextToken();
- moveable.toNextSibling(J2EE_NAMESPACE, "transaction-support");
- moveable.moveXml(cursor);
- while (moveable.toNextSibling(J2EE_NAMESPACE, "authentication-mechanism")) {
- moveable.moveXml(cursor);
- }
- moveable.toNextSibling(J2EE_NAMESPACE, "reauthentication-support");
- moveable.moveXml(cursor);
- } finally {
- moveable.dispose();
- }
-
- }
- } finally {
- cursor.dispose();
- }
- XmlObject result = xmlObject.changeType(ConnectorDocument.type);
- if (result != null) {
- XmlBeansUtil.validateDD(result);
- return (ConnectorDocument) result;
- }
- XmlBeansUtil.validateDD(xmlObject);
- return (ConnectorDocument) xmlObject;
-
- }
-
- public static EjbJarDocument convertToEJBSchema(XmlObject xmlObject) throws XmlException {
- if (EjbJarDocument.type.equals(xmlObject.schemaType())) {
- XmlBeansUtil.validateDD(xmlObject);
- return (EjbJarDocument) xmlObject;
- }
- XmlCursor cursor = xmlObject.newCursor();
- XmlCursor moveable = xmlObject.newCursor();
- //cursor is intially located before the logical STARTDOC token
- try {
- cursor.toFirstChild();
- if ("http://java.sun.com/xml/ns/j2ee".equals(cursor.getName().getNamespaceURI())) {
- XmlObject result = xmlObject.changeType(EjbJarDocument.type);
- XmlBeansUtil.validateDD(result);
- return (EjbJarDocument) result;
- }
- // deployment descriptor is probably in EJB 1.1 or 2.0 format
- XmlDocumentProperties xmlDocumentProperties = cursor.documentProperties();
- String publicId = xmlDocumentProperties.getDoctypePublicId();
- String cmpVersion;
- if ("-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN".equals(publicId)) {
- cmpVersion = "1.x";
- } else if ("-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN".equals(publicId)) {
- cmpVersion = null;//2.x is the default "2.x";
- } else {
- throw new XmlException("Unrecognized document type: " + publicId);
- }
- String schemaLocationURL = "http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd";
- String version = "2.1";
- convertToSchema(cursor, J2EE_NAMESPACE, schemaLocationURL, version);
- //play with message-driven
- cursor.toStartDoc();
- convertBeans(cursor, moveable, cmpVersion);
- } finally {
- cursor.dispose();
- moveable.dispose();
- }
- XmlObject result = xmlObject.changeType(EjbJarDocument.type);
- if (result != null) {
- XmlBeansUtil.validateDD(result);
- return (EjbJarDocument) result;
- }
- XmlBeansUtil.validateDD(xmlObject);
- return (EjbJarDocument) xmlObject;
- }
-
public static void convertToGeronimoSubSchemas(XmlCursor cursor) {
cursor.toStartDoc();
XmlCursor end = cursor.newCursor();
@@ -385,98 +237,6 @@
return true;
- }
-
- public static void convertBeans(XmlCursor cursor, XmlCursor moveable, String cmpVersion) {
- cursor.toChild(J2EE_NAMESPACE, "ejb-jar");
- cursor.toChild(J2EE_NAMESPACE, "enterprise-beans");
- if (cursor.toFirstChild()) {
- //there's at least one ejb...
- do {
- cursor.push();
- String type = cursor.getName().getLocalPart();
- if ("session".equals(type)) {
- cursor.toChild(J2EE_NAMESPACE, "transaction-type");
- cursor.toNextSibling();
- convertToJNDIEnvironmentRefsGroup(J2EE_NAMESPACE, cursor, moveable);
- } else if ("entity".equals(type)) {
- cursor.toChild(J2EE_NAMESPACE, "persistence-type");
- String persistenceType = cursor.getTextValue();
- //reentrant is the last required tag before jndiEnvironmentRefsGroup
- cursor.toNextSibling(J2EE_NAMESPACE, "reentrant");
- //Convert 2.0 True/False to true/false for 2.1
- cursor.setTextValue(cursor.getTextValue().toLowerCase());
- if (cmpVersion != null && !cursor.toNextSibling(CMP_VERSION) && "Container".equals(persistenceType)) {
- cursor.toNextSibling();
- cursor.insertElementWithText(CMP_VERSION, cmpVersion);
- }
-
- cursor.toNextSibling(J2EE_NAMESPACE, "abstract-schema-name");
- while (cursor.toNextSibling(J2EE_NAMESPACE, "cmp-field")) {
- }
- cursor.toNextSibling(J2EE_NAMESPACE, "primkey-field");
- cursor.toNextSibling();
- convertToJNDIEnvironmentRefsGroup(J2EE_NAMESPACE, cursor, moveable);
- } else if ("message-driven".equals(type)) {
- cursor.toFirstChild();
- if (cursor.toNextSibling(J2EE_NAMESPACE, "messaging-type")) {
- cursor.toNextSibling(J2EE_NAMESPACE, "transaction-type");
- } else {
- cursor.toNextSibling(J2EE_NAMESPACE, "transaction-type");
- //insert messaging-type (introduced in EJB 2.1 spec) before transaction-type
- cursor.insertElementWithText("messaging-type", J2EE_NAMESPACE, "javax.jms.MessageListener");
- //cursor still on transaction-type
- }
- if (!cursor.toNextSibling(J2EE_NAMESPACE, "activation-config")) {
- //skip transaction-type
- cursor.toNextSibling();
- //convert EJB 2.0 elements to activation-config-properties.
- moveable.toCursor(cursor);
- cursor.push();
- cursor.beginElement("activation-config", J2EE_NAMESPACE);
- boolean hasProperties = addActivationConfigProperty(moveable, cursor, "message-selector", "messageSelector");
- hasProperties |= addActivationConfigProperty(moveable, cursor, "acknowledge-mode", "acknowledgeMode");
- if (new QName(J2EE_NAMESPACE, "message-driven-destination").equals(moveable.getName()) ||
- moveable.toNextSibling(J2EE_NAMESPACE, "message-driven-destination")) {
- moveable.push();
- moveable.toFirstChild();
- hasProperties |= addActivationConfigProperty(moveable, cursor, "destination-type", "destinationType");
- hasProperties |= addActivationConfigProperty(moveable, cursor, "subscription-durability", "subscriptionDurability");
- moveable.pop();
- moveable.removeXml();
- }
- cursor.pop();
- if (!hasProperties) {
- //the activation-config element that we created is empty so delete it
- cursor.toPrevSibling();
- cursor.removeXml();
- //cursor should now be at first element in JNDIEnvironmentRefsGroup
- }
- } else {
- //cursor pointing at activation-config
- cursor.toNextSibling();
- //cursor should now be at first element in JNDIEnvironmentRefsGroup
- }
- convertToJNDIEnvironmentRefsGroup(J2EE_NAMESPACE, cursor, moveable);
- }
- cursor.pop();
- } while (cursor.toNextSibling());
- }
- }
-
- private static boolean addActivationConfigProperty(XmlCursor moveable, XmlCursor cursor, String elementName, String propertyName) {
- QName name = new QName(J2EE_NAMESPACE, elementName);
- if (name.equals(moveable.getName()) || moveable.toNextSibling(name)) {
- cursor.push();
- cursor.beginElement("activation-config-property", J2EE_NAMESPACE);
- cursor.insertElementWithText("activation-config-property-name", J2EE_NAMESPACE, propertyName);
- cursor.insertElementWithText("activation-config-property-value", J2EE_NAMESPACE, moveable.getTextValue());
- moveable.removeXml();
- cursor.pop();
- cursor.toNextSibling();
- return true;
- }
- return false;
}
/**
Modified: geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java?view=diff&rev=450537&r1=450536&r2=450537
==============================================================================
--- geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java (original)
+++ geronimo/server/branches/sachin/modules/geronimo-j2ee-schema/src/test/java/org/apache/geronimo/schema/SchemaConversionUtilsTest.java Wed Sep 27 11:22:17 2006
@@ -64,180 +64,6 @@
//The schemas have been fixed by sun, we can use the official schemas.
- public void testApplicationClient13ToApplicationClient14Transform() throws Exception {
- URL srcXml = classLoader.getResource("j2ee_1_3dtd/application-client-13.xml");
- URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/application-client-14.xml");
- XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
- XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
- XmlBeansUtil.validateDD(expected);
- xmlObject = SchemaConversionUtils.convertToApplicationClientSchema(xmlObject);
-// log.debug(xmlObject.toString());
-// log.debug(expected.toString());
- List problems = new ArrayList();
- boolean ok = compareXmlObjects(xmlObject, expected, problems);
- assertTrue("Differences: " + problems, ok);
- //make sure trying to convert twice has no bad effects
- XmlCursor cursor2 = xmlObject.newCursor();
- try {
- String schemaLocationURL = "http://java.sun.com/xml/ns/j2ee/application_1_4.xsd";
- String version = "1.4";
- assertFalse(SchemaConversionUtils.convertToSchema(cursor2, SchemaConversionUtils.J2EE_NAMESPACE, schemaLocationURL, version));
- } finally {
- cursor2.dispose();
- }
- boolean ok2 = compareXmlObjects(xmlObject, expected, problems);
- assertTrue("Differences after reconverting to schema: " + problems, ok2);
- //do the whole transform twice...
- xmlObject = SchemaConversionUtils.convertToApplicationClientSchema(xmlObject);
- boolean ok3 = compareXmlObjects(xmlObject, expected, problems);
- assertTrue("Differences after reconverting to application client schema: " + problems, ok3);
- }
-
- public void testConnector10ToConnector15Transform() throws Exception {
- URL srcXml = classLoader.getResource("j2ee_1_3dtd/ra-10.xml");
- URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/ra-15.xml");
- XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
- XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
- XmlBeansUtil.validateDD(expected);
- xmlObject = SchemaConversionUtils.convertToConnectorSchema(xmlObject);
-// log.debug(xmlObject.toString());
-// log.debug(expected.toString());
- List problems = new ArrayList();
- boolean ok = compareXmlObjects(xmlObject, expected, problems);
- assertTrue("Differences: " + problems, ok);
- //make sure trying to convert twice has no bad effects
- XmlCursor cursor2 = xmlObject.newCursor();
- try {
- String schemaLocationURL = "http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd";
- String version = "1.4";
- assertFalse(SchemaConversionUtils.convertToSchema(cursor2, SchemaConversionUtils.J2EE_NAMESPACE, schemaLocationURL, version));
- } finally {
- cursor2.dispose();
- }
- boolean ok2 = compareXmlObjects(xmlObject, expected, problems);
- assertTrue("Differences after reconverting to schema: " + problems, ok2);
- //do the whole transform twice...
- xmlObject = SchemaConversionUtils.convertToConnectorSchema(xmlObject);
- boolean ok3 = compareXmlObjects(xmlObject, expected, problems);
- assertTrue("Differences after reconverting to application schema: " + problems, ok3);
- }
-
- public void testEJB11ToEJB21Transform() throws Exception {
- URL srcXml = classLoader.getResource("j2ee_1_2dtd/ejb-1-11.xml");
- URL expectedOutputXml = classLoader.getResource("j2ee_1_2dtd/ejb-1-21.xml");
- XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
- XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
- XmlBeansUtil.validateDD(expected);
- xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
-// log.debug(xmlObject.toString());
-// log.debug(expected.toString());
- List problems = new ArrayList();
- boolean ok = compareXmlObjects(xmlObject, expected, problems);
- assertTrue("Differences: " + problems, ok);
- //make sure trying to convert twice has no bad effects
- XmlCursor cursor2 = xmlObject.newCursor();
- try {
- String schemaLocationURL = "http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd";
- String version = "2.1";
- assertFalse(SchemaConversionUtils.convertToSchema(cursor2, SchemaConversionUtils.J2EE_NAMESPACE, schemaLocationURL, version));
- } finally {
- cursor2.dispose();
- }
- boolean ok2 = compareXmlObjects(xmlObject, expected, problems);
- assertTrue("Differences after reconverting to schema: " + problems, ok2);
- //do the whole transform twice...
- xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
- boolean ok3 = compareXmlObjects(xmlObject, expected, problems);
- assertTrue("Differences after reconverting to ejb schema: " + problems, ok3);
- }
-
- public void testEJB20ToEJB21Transform() throws Exception {
- URL srcXml = classLoader.getResource("j2ee_1_3dtd/ejb-jar.xml");
- URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/ejb-jar-21.xml");
- XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
- XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
- XmlBeansUtil.validateDD(expected);
- xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
-// log.debug(xmlObject.toString());
-// log.debug(expected.toString());
- List problems = new ArrayList();
- boolean ok = compareXmlObjects(xmlObject, expected, problems);
- assertTrue("Differences: " + problems, ok);
- //make sure trying to convert twice has no bad effects
- XmlCursor cursor2 = xmlObject.newCursor();
- try {
- String schemaLocationURL = "http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd";
- String version = "2.1";
- assertFalse(SchemaConversionUtils.convertToSchema(cursor2, SchemaConversionUtils.J2EE_NAMESPACE, schemaLocationURL, version));
- } finally {
- cursor2.dispose();
- }
- boolean ok2 = compareXmlObjects(xmlObject, expected, problems);
- assertTrue("Differences after reconverting to schema: " + problems, ok2);
- //do the whole transform twice...
- xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
- boolean ok3 = compareXmlObjects(xmlObject, expected, problems);
- assertTrue("Differences after reconverting to ejb schema: " + problems, ok3);
- }
-
- public void testMDB20ToEJB21TransformBugGERONIMO_1649() throws Exception {
- URL srcXml = classLoader.getResource("j2ee_1_3dtd/mdb-ejb-jar-20-GERONIMO-1649.xml");
- URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/mdb-ejb-jar-21-GERONIMO-1649.xml");
- XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
- XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
- XmlBeansUtil.validateDD(expected);
- xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
-// log.debug(xmlObject.toString());
-// log.debug(expected.toString());
- List problems = new ArrayList();
- boolean ok = compareXmlObjects(xmlObject, expected, problems);
- assertTrue("Differences: " + problems, ok);
- //make sure trying to convert twice has no bad effects
- XmlCursor cursor2 = xmlObject.newCursor();
- try {
- String schemaLocationURL = "http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd";
- String version = "2.1";
- assertFalse(SchemaConversionUtils.convertToSchema(cursor2, SchemaConversionUtils.J2EE_NAMESPACE, schemaLocationURL, version));
- } finally {
- cursor2.dispose();
- }
- boolean ok2 = compareXmlObjects(xmlObject, expected, problems);
- assertTrue("Differences after reconverting to schema: " + problems, ok2);
- //do the whole transform twice...
- xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
- boolean ok3 = compareXmlObjects(xmlObject, expected, problems);
- assertTrue("Differences after reconverting to ejb schema: " + problems, ok3);
- }
-
- public void testMDB20To21Transform() throws Exception {
- URL srcXml = classLoader.getResource("j2ee_1_3dtd/mdb-ejb-jar-20.xml");
- URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/mdb-ejb-jar-21.xml");
- XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
- XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
- XmlBeansUtil.validateDD(expected);
- xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
-// log.debug(xmlObject.toString());
-// log.debug(expected.toString());
- List problems = new ArrayList();
- boolean ok = compareXmlObjects(xmlObject, expected, problems);
- assertTrue("Differences: " + problems, ok);
- //make sure trying to convert twice has no bad effects
- XmlCursor cursor2 = xmlObject.newCursor();
- try {
- String schemaLocationURL = "http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd";
- String version = "2.1";
- assertFalse(SchemaConversionUtils.convertToSchema(cursor2, SchemaConversionUtils.J2EE_NAMESPACE, schemaLocationURL, version));
- } finally {
- cursor2.dispose();
- }
- boolean ok2 = compareXmlObjects(xmlObject, expected, problems);
- assertTrue("Differences after reconverting to schema: " + problems, ok2);
- //do the whole transform twice...
- xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
- boolean ok3 = compareXmlObjects(xmlObject, expected, problems);
- assertTrue("Differences after reconverting to ejb schema: " + problems, ok3);
- }
-
public void testOrderDescriptionGroup() throws Exception {
URL srcXml = classLoader.getResource("j2ee_1_3dtd/DescriptionGroupTestSource.xml");
URL expectedOutputXml = classLoader.getResource("j2ee_1_3dtd/DescriptionGroupTestExpected.xml");
@@ -290,17 +116,6 @@
XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
List problems = new ArrayList();
boolean ok = compareXmlObjects(srcObject, expected, problems);
- assertTrue("Differences: " + problems, ok);
- }
-
- public void testEJB21To21DoesNothing() throws Exception {
- URL srcXml = classLoader.getResource("j2ee_1_4schema/ejb-jar.xml");
- URL expectedOutputXml = classLoader.getResource("j2ee_1_4schema/ejb-jar.xml");
- XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
- xmlObject = SchemaConversionUtils.convertToEJBSchema(xmlObject);
- XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
- List problems = new ArrayList();
- boolean ok = compareXmlObjects(xmlObject, expected, problems);
assertTrue("Differences: " + problems, ok);
}