You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/09/29 00:10:54 UTC
svn commit: r292333 [1/4] - in /geronimo/trunk:
applications/console-ear/src/plan/
applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/
applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activem...
Author: djencks
Date: Wed Sep 28 15:09:15 2005
New Revision: 292333
URL: http://svn.apache.org/viewcvs?rev=292333&view=rev
Log:
GERONIMO-1027, GERONIMO-957. Version our schemas, and provide specific jetty and tomcat schemas. Schema processing cleanup. A couple other minor fixes
Added:
geronimo/trunk/modules/assembly/src/plan/uddi-server-jetty-plan.xml
geronimo/trunk/modules/assembly/src/plan/uddi-server-tomcat-plan.xml
geronimo/trunk/modules/assembly/src/plan/webconsole-jetty-plan.xml
geronimo/trunk/modules/assembly/src/plan/webconsole-tomcat-plan.xml
geronimo/trunk/modules/assembly/src/plan/welcome-jetty-plan.xml
geronimo/trunk/modules/assembly/src/plan/welcome-tomcat-plan.xml
geronimo/trunk/modules/assembly/src/var/config/config.jetty.list
geronimo/trunk/modules/assembly/src/var/config/config.jetty.xml
geronimo/trunk/modules/assembly/src/var/config/config.tomcat.list
geronimo/trunk/modules/assembly/src/var/config/config.tomcat.xml
geronimo/trunk/modules/axis-builder/src/test-resources/schema/schema5.xsd
geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client-1.0.xsd
- copied, changed from r292006, geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client.xsd
geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector-1.0.xsd
- copied, changed from r292006, geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector.xsd
geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application-1.0.xsd
- copied, changed from r292006, geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application.xsd
geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty-1.0.xsd
geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty-config-1.0.xsd
geronimo/trunk/modules/jetty-builder/src/test-resources/plans/plan1A.xml
geronimo/trunk/modules/jetty-builder/src/test-resources/plans/plan1B.xml
geronimo/trunk/modules/jetty-builder/src/test-resources/plans/plan1C.xml
geronimo/trunk/modules/jetty-builder/src/test-resources/plans/plan4-converted.xml
geronimo/trunk/modules/naming-builder/src/schema/geronimo-naming-1.0.xsd
- copied, changed from r292006, geronimo/trunk/modules/naming-builder/src/schema/geronimo-naming.xsd
geronimo/trunk/modules/security-builder/src/schema/geronimo-login-config-1.0.xsd
- copied, changed from r292006, geronimo/trunk/modules/security-builder/src/schema/geronimo-login-config.xsd
geronimo/trunk/modules/security-builder/src/schema/geronimo-security-1.0.xsd
- copied, changed from r292006, geronimo/trunk/modules/security-builder/src/schema/geronimo-security.xsd
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/xmlbeans/
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/xmlbeans/XmlBeansUtil.java
geronimo/trunk/modules/service-builder/src/schema/geronimo-config-1.0.xsd
- copied, changed from r292006, geronimo/trunk/modules/service-builder/src/schema/geronimo-config.xsd
geronimo/trunk/modules/service-builder/src/schema/geronimo-javabean-xmlattribute-1.0.xsd
- copied, changed from r292006, geronimo/trunk/modules/service-builder/src/schema/geronimo-javabean-xmlattribute.xsd
geronimo/trunk/modules/service-builder/src/schema/geronimo-service-1.0.xsd
- copied, changed from r292006, geronimo/trunk/modules/service-builder/src/schema/geronimo-service.xsd
geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat-1.0.xsd
- copied, changed from r292006, geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat.xsd
geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat-config-1.0.xsd
geronimo/trunk/modules/web-builder/src/java/org/apache/geronimo/web/deployment/GenericToSpecificPlanConverter.java
geronimo/trunk/modules/web-builder/src/schema/geronimo-web-1.0.xsd
- copied, changed from r292006, geronimo/trunk/modules/web-builder/src/schema/geronimo-web.xsd
Removed:
geronimo/trunk/applications/welcome/src/webapp/WEB-INF/geronimo-web.xml
geronimo/trunk/modules/client-builder/src/schema/geronimo-application-client.xsd
geronimo/trunk/modules/connector-builder/src/schema/geronimo-connector.xsd
geronimo/trunk/modules/deployment/src/java/org/apache/geronimo/deployment/util/DeploymentHelper.java
geronimo/trunk/modules/j2ee-builder/src/schema/geronimo-application.xsd
geronimo/trunk/modules/jetty-builder/src/schema/geronimo-jetty.xsd
geronimo/trunk/modules/naming-builder/src/schema/geronimo-naming.xsd
geronimo/trunk/modules/security-builder/src/schema/geronimo-login-config.xsd
geronimo/trunk/modules/security-builder/src/schema/geronimo-security.xsd
geronimo/trunk/modules/service-builder/src/schema/geronimo-config.xsd
geronimo/trunk/modules/service-builder/src/schema/geronimo-javabean-xmlattribute.xsd
geronimo/trunk/modules/service-builder/src/schema/geronimo-service.xsd
geronimo/trunk/modules/tomcat-builder/src/schema/geronimo-tomcat.xsd
geronimo/trunk/modules/web-builder/src/schema/geronimo-web.xsd
Modified:
geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml
geronimo/trunk/applications/console-ear/src/plan/plan.xml
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/DatabaseManagerHelper.java
geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java
geronimo/trunk/applications/demo/src/webapp/WEB-INF/geronimo-web.xml
geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml
geronimo/trunk/modules/assembly/maven.xml
geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml
geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml
geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml
geronimo/trunk/modules/assembly/src/plan/directory-server-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-client-corba-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-runtime-deployer-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-security-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-server-corba-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-plan.xml
geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-runtime-deployer-plan.xml
geronimo/trunk/modules/assembly/src/plan/naming-server-plan.xml
geronimo/trunk/modules/assembly/src/plan/spring-deployer-plan.xml
geronimo/trunk/modules/assembly/src/plan/spring-runtime-plan.xml
geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml
geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml
geronimo/trunk/modules/assembly/src/plan/system-jms-plan.xml
geronimo/trunk/modules/assembly/src/plan/system-plan.xml
geronimo/trunk/modules/assembly/src/var/config/config.list
geronimo/trunk/modules/assembly/src/var/config/config.xml
geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/SchemaInfoBuilder.java
geronimo/trunk/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ParsingTest.java
geronimo/trunk/modules/axis/src/etc/META-INF/geronimo-service.xml
geronimo/trunk/modules/axis/src/plans/plan1.xml
geronimo/trunk/modules/client-builder/maven.xml
geronimo/trunk/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
geronimo/trunk/modules/client-builder/src/schema/xmlconfig.xml
geronimo/trunk/modules/client-builder/src/test-resources/plans/plan1.xml
geronimo/trunk/modules/client-builder/src/test-resources/plans/plan2.xml
geronimo/trunk/modules/connector-builder/maven.xml
geronimo/trunk/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
geronimo/trunk/modules/connector-builder/src/schema/xmlconfig.xml
geronimo/trunk/modules/connector-builder/src/test-data/connector_1_0/geronimo-ra.xml
geronimo/trunk/modules/connector-builder/src/test-data/connector_1_5/geronimo-ra.xml
geronimo/trunk/modules/connector-builder/src/test-data/data/dup-admin-object-name.xml
geronimo/trunk/modules/connector-builder/src/test-data/data/dup-connectionfactoryinstance-name.xml
geronimo/trunk/modules/connector-builder/src/test-data/data/dup-resourceadapter-name.xml
geronimo/trunk/modules/connector-builder/src/test-data/data/external-application-plan.xml
geronimo/trunk/modules/connector-builder/src/test-data/data/old-schema-plan.xml
geronimo/trunk/modules/connector-builder/src/test-data/ear/geronimo-application.xml
geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/PlanParsingTest.java
geronimo/trunk/modules/deployment/project.xml
geronimo/trunk/modules/j2ee-builder/maven.xml
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBModule.java
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/Module.java
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java
geronimo/trunk/modules/j2ee-builder/src/schema/xmlconfig.xml
geronimo/trunk/modules/j2ee-builder/src/test-ear/META-INF/geronimo-application.xml
geronimo/trunk/modules/j2ee-builder/src/test-ear/test-ejb-jar/META-INF/openejb-jar.xml
geronimo/trunk/modules/j2ee-builder/src/test-ear/test-war/WEB-INF/geronimo-web.xml
geronimo/trunk/modules/j2ee-builder/src/test-ear13/META-INF/geronimo-application.xml
geronimo/trunk/modules/j2ee-builder/src/test-ear13/test-ejb-jar/META-INF/openejb-jar.xml
geronimo/trunk/modules/j2ee-builder/src/test-ear13/test-war/WEB-INF/geronimo-web.xml
geronimo/trunk/modules/j2ee-builder/src/test-plan/test-bad-car.xml
geronimo/trunk/modules/j2ee-builder/src/test-plan/test-bad-ejb-jar.xml
geronimo/trunk/modules/j2ee-builder/src/test-plan/test-bad-rar.xml
geronimo/trunk/modules/j2ee-builder/src/test-plan/test-bad-war.xml
geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application-alt-dd.xml
geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/META-INF/geronimo-application.xml
geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/alt-ger-ejb-jar.xml
geronimo/trunk/modules/j2ee-builder/src/test-unpacked-ear/alt-ger-war.xml
geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
geronimo/trunk/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
geronimo/trunk/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java
geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-post.xml
geronimo/trunk/modules/j2ee-schema/src/test-data/geronimo/ejb-naming-pre.xml
geronimo/trunk/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
geronimo/trunk/modules/jetty-builder/maven.xml
geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
geronimo/trunk/modules/jetty-builder/src/schema/xmlconfig.xml
geronimo/trunk/modules/jetty-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
geronimo/trunk/modules/jetty-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
geronimo/trunk/modules/jetty-builder/src/test-resources/deployables/war5/WEB-INF/geronimo-jetty.xml
geronimo/trunk/modules/jetty-builder/src/test-resources/plans/plan1.xml
geronimo/trunk/modules/jetty-builder/src/test-resources/plans/plan2.xml
geronimo/trunk/modules/jetty-builder/src/test-resources/plans/plan3.xml
geronimo/trunk/modules/jetty-builder/src/test-resources/plans/plan4.xml
geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/PlanParsingTest.java
geronimo/trunk/modules/jetty/src/etc/META-INF/geronimo-service.xml
geronimo/trunk/modules/jetty/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
geronimo/trunk/modules/jetty/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
geronimo/trunk/modules/naming-builder/maven.xml
geronimo/trunk/modules/naming-builder/src/schema/xmlconfig.xml
geronimo/trunk/modules/security-builder/maven.xml
geronimo/trunk/modules/security-builder/src/java/org/apache/geronimo/security/deployment/LoginConfigBuilder.java
geronimo/trunk/modules/security-builder/src/schema/xmlconfig.xml
geronimo/trunk/modules/security/src/test-data/xml/deployment/geronimo-security.xml
geronimo/trunk/modules/service-builder/maven.xml
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/JavaBeanXmlAttributeBuilder.java
geronimo/trunk/modules/service-builder/src/java/org/apache/geronimo/deployment/service/ServiceConfigBuilder.java
geronimo/trunk/modules/service-builder/src/schema/xmlconfig.xml
geronimo/trunk/modules/service-builder/src/test-resources/services/plan1.xml
geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/SilentStartupMonitor.java
geronimo/trunk/modules/test-ddbean/project.xml
geronimo/trunk/modules/test-ddbean/src/java/org/apache/geronimo/deployment/tools/DDBeanRootImpl.java
geronimo/trunk/modules/tomcat-builder/maven.xml
geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
geronimo/trunk/modules/tomcat-builder/src/schema/xmlconfig.xml
geronimo/trunk/modules/tomcat-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
geronimo/trunk/modules/tomcat-builder/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
geronimo/trunk/modules/tomcat-builder/src/test-resources/deployables/war4/WEB-INF/geronimo-web.xml
geronimo/trunk/modules/tomcat-builder/src/test-resources/plans/plan1.xml
geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/PlanParsingTest.java
geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
geronimo/trunk/modules/tomcat/src/etc/META-INF/geronimo-service.xml
geronimo/trunk/modules/tomcat/src/plan/tomcat-plan.xml
geronimo/trunk/modules/tomcat/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
geronimo/trunk/modules/tomcat/src/test-resources/deployables/war3/WEB-INF/geronimo-web.xml
geronimo/trunk/modules/web-builder/maven.xml
geronimo/trunk/modules/web-builder/project.xml
geronimo/trunk/modules/web-builder/src/schema/xmlconfig.xml
geronimo/trunk/modules/web-builder/src/test-resources/deployables/war1/WEB-INF/geronimo-web.xml
geronimo/trunk/plugins/geronimo-assembly-plugin/plugin.jelly
Modified: geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml (original)
+++ geronimo/trunk/applications/console-ear/src/plan/geronimo-application.xml Wed Sep 28 15:09:15 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<application
- xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
+ xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
configId="org/apache/geronimo/Console"
parentId="org/apache/geronimo/Server">
Modified: geronimo/trunk/applications/console-ear/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-ear/src/plan/plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/applications/console-ear/src/plan/plan.xml (original)
+++ geronimo/trunk/applications/console-ear/src/plan/plan.xml Wed Sep 28 15:09:15 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<application
- xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
+ xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
configId="${pom.groupId}/cars/${pom.artifactId}-${pom.currentVersion}.car"
parentId="${pom.groupId}/cars/j2ee-server-${pom.currentVersion}.car"
>
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/DatabaseManagerHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/DatabaseManagerHelper.java?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/DatabaseManagerHelper.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/databasemanager/DatabaseManagerHelper.java Wed Sep 28 15:09:15 2005
@@ -108,7 +108,7 @@
StringBuffer sb = new StringBuffer();
sb.append("<?xml version=\"1.0\"?>\n");
sb
- .append("<connector xmlns=\"http://geronimo.apache.org/xml/ns/j2ee/connector\"\n");
+ .append("<connector xmlns=\"http://geronimo.apache.org/xml/ns/j2ee/connector-1.0\"\n");
sb.append(" version=\"1.5\" configId=\"{0}\" parentId=\"{1}\">\n");
sb.append(" <dependency>\n");
sb.append(" <uri>{2}</uri>\n");
Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java (original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java Wed Sep 28 15:09:15 2005
@@ -109,7 +109,7 @@
StringBuffer sb = new StringBuffer();
sb.append("<?xml version=\"1.0\"?>\n");
sb
- .append("<connector xmlns=\"http://geronimo.apache.org/xml/ns/j2ee/connector\"\n");
+ .append("<connector xmlns=\"http://geronimo.apache.org/xml/ns/j2ee/connector-1.0\"\n");
sb.append(" version=\"1.5\" configId=\"{0}\" parentId=\"{1}\">\n");
sb.append(" <resourceadapter>\n");
sb.append(" <resourceadapter-instance>\n");
Modified: geronimo/trunk/applications/demo/src/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/demo/src/webapp/WEB-INF/geronimo-web.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/applications/demo/src/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/trunk/applications/demo/src/webapp/WEB-INF/geronimo-web.xml Wed Sep 28 15:09:15 2005
@@ -17,8 +17,8 @@
-->
<web-app
- xmlns="http://geronimo.apache.org/xml/ns/web"
- xmlns:sec="http://geronimo.apache.org/xml/ns/security"
+ xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.0"
+ xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.0"
configId="org/apache/geronimo/Demo"
parentId="org/apache/geronimo/SampleSecurityRealm">
Modified: geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/trunk/applications/jmxdebug/src/webapp/WEB-INF/geronimo-web.xml Wed Sep 28 15:09:15 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app
- xmlns="http://geronimo.apache.org/xml/ns/web"
+ xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.0"
configId="org/apache/geronimo/DebugConsole"
parentId="org/apache/geronimo/Server"
>
Modified: geronimo/trunk/modules/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/maven.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/maven.xml (original)
+++ geronimo/trunk/modules/assembly/maven.xml Wed Sep 28 15:09:15 2005
@@ -155,15 +155,15 @@
<ant:unzip src="${maven.repo.local}/openejb/jars/openejb-pkgen-builder-${openejb_version}.jar"
dest="${geronimo.assembly.dir}">
<ant:patternset>
- <ant:include name="META-INF/schema/openejb-pkgen.xsd"/>
+ <ant:include name="META-INF/schema/openejb-pkgen*.xsd"/>
</ant:patternset>
</ant:unzip>
<ant:unzip src="${maven.repo.local}/openejb/jars/openejb-builder-${openejb_version}.jar"
dest="${geronimo.assembly.dir}">
<ant:patternset>
- <ant:include name="META-INF/schema/openejb-jar.xsd"/>
- <ant:include name="META-INF/schema/corba-css-config_1_0.xsd"/>
- <ant:include name="META-INF/schema/corba-tss-config_1_0.xsd"/>
+ <ant:include name="META-INF/schema/openejb-jar*.xsd"/>
+ <ant:include name="META-INF/schema/corba-css-config*.xsd"/>
+ <ant:include name="META-INF/schema/corba-tss-config*.xsd"/>
</ant:patternset>
</ant:unzip>
<ant:move todir="${geronimo.assembly.dir}/schema">
@@ -176,11 +176,11 @@
<!-- update include paths in all schemas -->
<ant:fileScanner var="schemaScanner">
<ant:fileset dir="${geronimo.assembly.dir}/schema">
- <ant:include name="geronimo-application.xsd"/>
- <ant:include name="geronimo-application-client.xsd"/>
- <ant:include name="geronimo-jetty.xsd"/>
- <ant:include name="geronimo-tomcat.xsd"/>
- <ant:include name="geronimo-connector_1_5.xsd"/>
+ <ant:include name="geronimo-application*.xsd"/>
+ <ant:include name="geronimo-application-client*.xsd"/>
+ <ant:include name="geronimo-jetty*.xsd"/>
+ <ant:include name="geronimo-tomcat*.xsd"/>
+ <ant:include name="geronimo-connector*.xsd"/>
</ant:fileset>
</ant:fileScanner>
<j:forEach var="schema" items="${schemaScanner.iterator()}">
@@ -191,7 +191,6 @@
</j:forEach>
<!-- copy in data files -->
- <!-- the persistent config list must be recopied in due to user of online deployer -->
<ant:copy todir="${geronimo.assembly.dir}/var">
<ant:fileset dir="src/var"/>
</ant:copy>
@@ -200,13 +199,11 @@
<ant:mkdir dir="${geronimo.assembly.dir}/var/ldap"/>
<!-- Add tomcat files -->
- <!-- <j:if test="${context.getVariable('geronimo.web.container').equals('tomcat')}">-->
<ant:copy todir="${geronimo.assembly.dir}/var/catalina/conf"
file="${project.root}/modules/tomcat/src/var/web.xml"/>
<ant:copy todir="${geronimo.assembly.dir}/var/catalina/ROOT">
<ant:fileset dir="${project.root}/modules/tomcat/src/var/ROOT"/>
</ant:copy>
- <!-- </j:if>-->
<!-- Load the repository -->
<ant:mkdir dir="${geronimo.assembly.dir}/repository"/>
@@ -278,22 +275,29 @@
<j:set var="PlanDerbyPort" value="1527"/>
<j:set var="PlanRemoteLoginPort" value="4242"/>
<j:set var="PlanLdapPort" value="1389"/>
+ <j:set var="PlanJettyWebBuilderDefaultNamespace" value="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"/>
+ <j:set var="PlanTomcatWebBuilderDefaultNamespace" value="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"/>
+ <j:set var="PlanHTTPPortPrimary" value="8080"/>
+ <j:set var="PlanHTTPSPortPrimary" value="8443"/>
+ <j:set var="PlanAJPPortPrimary" value="8009"/>
+ <j:set var="PlanHTTPPortSecondary" value="8090"/>
+ <j:set var="PlanHTTPSPortSecondary" value="8453"/>
+ <j:set var="PlanAJPPortSecondary" value="8019"/>
<j:if test="${context.getVariable('geronimo.web.container').equals('jetty')}">
<echo>JETTY CONTAINER</echo>
<j:set var="PlanWebServerName" value="Jetty"/>
- <j:set var="PlanWebBuilderDefaultNamespace" value="http://geronimo.apache.org/xml/ns/web/jetty"/>
+ <j:set var="PlanWebBuilderDefaultNamespace" value="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"/>
<j:set var="PlanHTTPPort" value="8080"/>
<j:set var="PlanHTTPSPort" value="8443"/>
- <j:set var="PlanClientCertHTTPSPort" value="8444"/>
<j:set var="PlanAJPPort" value="8009"/>
<j:set var="PlanHTTPPort2" value="8090"/>
<j:set var="PlanHTTPSPort2" value="8453"/>
<j:set var="PlanAJPPort2" value="8019"/>
</j:if>
<j:if test="${context.getVariable('geronimo.web.container').equals('tomcat')}">
- <echod>TOMCAT CONTAINER</echod>
+ <echo>TOMCAT CONTAINER</echo>
<j:set var="PlanWebServerName" value="Tomcat"/>
- <j:set var="PlanWebBuilderDefaultNamespace" value="http://geronimo.apache.org/xml/ns/web/tomcat"/>
+ <j:set var="PlanWebBuilderDefaultNamespace" value="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"/>
<j:set var="PlanHTTPPort" value="8090"/>
<j:set var="PlanHTTPSPort" value="8453"/>
<j:set var="PlanAJPPort" value="8019"/>
@@ -314,16 +318,31 @@
<ant:mkdir dir="${basedir}/target/plan"/>
<j:forEach var="plan" items="${plans.iterator()}">
<j:set var="planName" value="${plan.name}"/>
- <echo>Preprocessing ${planName}</echo>
+ <echo>Preprocessing plan ${planName}</echo>
<velocity:merge
basedir="${basedir}/src/plan"
template="${planName}"
name="${basedir}/target/plan/${planName}"/>
</j:forEach>
- <velocity:merge basedir="${basedir}/src/var/config"
- template="config.xml"
- name="${geronimo.assembly.dir}/var/config/config.xml"/>
+ <fileScanner var="configs">
+ <fileset dir="${basedir}/src/var/config">
+ <include name="config*.xml"/>
+ <include name="config*.list"/>
+ </fileset>
+ </fileScanner>
+
+ <j:forEach var="config" items="${configs.iterator()}">
+ <j:set var="configName" value="${config.name}"/>
+ <echo>Preprocessing config ${configName}</echo>
+ <velocity:merge
+ basedir="${basedir}/src/var/config"
+ template="${configName}"
+ name="${geronimo.assembly.dir}/var/config/${configName}"/>
+ </j:forEach>
+
+ <ant:copy tofile="${geronimo.assembly.dir}/var/config/config.both.xml" file="${geronimo.assembly.dir}/var/config/config.xml"/>
+ <ant:copy tofile="${geronimo.assembly.dir}/var/config/config.both.list" file="${geronimo.assembly.dir}/var/config/config.list"/>
<!-- copy the final plans -->
<ant:mkdir dir="${geronimo.assembly.dir}/doc"/>
@@ -621,6 +640,13 @@
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
+ plan="${basedir}/target/plan/welcome-jetty-plan.xml"
+ module="${maven.repo.local}/geronimo/wars/geronimo-welcome-${pom.currentVersion}.war"/>
+ <deploy:distribute
+ uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ plan="${basedir}/target/plan/welcome-tomcat-plan.xml"
module="${maven.repo.local}/geronimo/wars/geronimo-welcome-${pom.currentVersion}.war"/>
<!-- Management console -->
@@ -628,6 +654,13 @@
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
+ plan="${basedir}/target/plan/webconsole-jetty-plan.xml"
+ module="${maven.repo.local}/geronimo/ears/geronimo-console-${pom.currentVersion}.ear"/>
+ <deploy:distribute
+ uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ plan="${basedir}/target/plan/webconsole-tomcat-plan.xml"
module="${maven.repo.local}/geronimo/ears/geronimo-console-${pom.currentVersion}.ear"/>
<!-- Debug Tool -->
@@ -642,6 +675,13 @@
uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
username="system"
password="manager"
+ plan="${basedir}/target/plan/uddi-server-jetty-plan.xml"
+ module="${maven.repo.local}/geronimo/wars/geronimo-uddi-server-${pom.currentVersion}.war"/>
+ <deploy:distribute
+ uri="deployer:geronimo:jmx:rmi://localhost/jndi/rmi:/JMXConnector"
+ username="system"
+ password="manager"
+ plan="${basedir}/target/plan/uddi-server-tomcat-plan.xml"
module="${maven.repo.local}/geronimo/wars/geronimo-uddi-server-${pom.currentVersion}.war"/>
<!-- create SystemDatabase -->
@@ -655,11 +695,9 @@
<!-- re-copy in persistent config list -->
<echo message="refreshing persistent configuration list"/>
- <ant:copy todir="${geronimo.assembly.dir}/var" overwrite="true">
- <ant:fileset dir="src/var">
- <include name="config/config.list"/>
- </ant:fileset>
- </ant:copy>
+ <ant:copy tofile="${geronimo.assembly.dir}/var/config/config.list"
+ file="${geronimo.assembly.dir}/var/config/config.both.list"
+ overwrite="true"/>
</j:if>
</goal>
Modified: geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/client-system-plan.xml Wed Sep 28 15:09:15 2005
@@ -6,16 +6,16 @@
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
-
+
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.
-->
-
+
<!--
Configuration for the innermost ring of a Geronimo server.
@@ -27,7 +27,7 @@
specific services - those should be provided by children.
-->
<configuration
- xmlns="http://geronimo.apache.org/xml/ns/deployment"
+ xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="org/apache/geronimo/ClientSystem"
domain="geronimo.client"
server="client"
Modified: geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/default-database-plan.xml Wed Sep 28 15:09:15 2005
@@ -18,7 +18,7 @@
<!-- $Rev$ $Date$ -->
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
configId="org/apache/geronimo/DefaultDatabase"
parentId="org/apache/geronimo/Server">
Modified: geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/deployer-system-plan.xml Wed Sep 28 15:09:15 2005
@@ -6,23 +6,23 @@
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
-
+
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.
-->
-
+
<!--
Configuration for the system layer of the Geronimo deployer
-->
<configuration
- xmlns="http://geronimo.apache.org/xml/ns/deployment"
+ xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="org/apache/geronimo/DeployerSystem"
domain="geronimo.deployer"
server="deployer"
Modified: geronimo/trunk/modules/assembly/src/plan/directory-server-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/directory-server-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/directory-server-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/directory-server-plan.xml Wed Sep 28 15:09:15 2005
@@ -25,7 +25,7 @@
by the server.
-->
<configuration
- xmlns="http://geronimo.apache.org/xml/ns/deployment"
+ xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="org/apache/geronimo/Directory"
parentId="org/apache/geronimo/Server"
>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-client-corba-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-client-corba-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-client-corba-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-client-corba-plan.xml Wed Sep 28 15:09:15 2005
@@ -56,7 +56,7 @@
<attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
<attribute name="description">SSLClientCert</attribute>
<xml-attribute name="nssConfig">
- <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config_1_0">
+ <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
<css:compoundSecMechTypeList>
<css:compoundSecMech>
<css:SSL>
@@ -68,7 +68,7 @@
</css:css>
</xml-attribute>
<xml-attribute name="cssConfig">
- <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config_1_0">
+ <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
<css:compoundSecMechTypeList>
<css:compoundSecMech>
<css:SSL>
@@ -96,7 +96,7 @@
<attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
<attribute name="description">SSLClientPassword</attribute>
<xml-attribute name="nssConfig">
- <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config_1_0">
+ <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
<css:compoundSecMechTypeList>
<css:compoundSecMech>
<css:SSL>
@@ -108,7 +108,7 @@
</css:css>
</xml-attribute>
<xml-attribute name="cssConfig">
- <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config_1_0">
+ <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
<css:compoundSecMechTypeList>
<css:compoundSecMech>
<css:SSL>
@@ -138,7 +138,7 @@
<attribute name="description">NoSecurity</attribute>
<attribute name="cssArgs"></attribute>
<xml-attribute name="cssConfig">
- <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config_1_0">
+ <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
<css:compoundSecMechTypeList>
<css:compoundSecMech>
<css:SSL>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-client-plan.xml Wed Sep 28 15:09:15 2005
@@ -25,7 +25,7 @@
by the app client.
-->
<configuration
- xmlns="http://geronimo.apache.org/xml/ns/deployment"
+ xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
parentId="org/apache/geronimo/ClientSystem"
configId="org/apache/geronimo/Client"
>
@@ -106,11 +106,11 @@
<dependency>
<uri>scout/jars/scout-${scout_version}.jar</uri>
</dependency>
-
+
<dependency>
<uri>juddi/jars/juddi-${juddi_version}.jar</uri>
</dependency>
-
+
<dependency>
<uri>jdom/jars/jdom-1.0.jar</uri>
</dependency>
@@ -121,7 +121,7 @@
<attribute name="namingFactoryUrlPkgs">org.apache.geronimo.naming</attribute>
<attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
</gbean>
-
+
<!--client connector support-->
<gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
<attribute name="keepAliveTime">5000</attribute>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-deployer-plan.xml Wed Sep 28 15:09:15 2005
@@ -22,7 +22,7 @@
Configuration for the Geronimo deployer
-->
<configuration
- xmlns="http://geronimo.apache.org/xml/ns/deployment"
+ xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="org/apache/geronimo/OfflineDeployer"
parentId="org/apache/geronimo/DeployerSystem"
>
@@ -384,7 +384,7 @@
<!-- web switching builder -->
<gbean name="WebBuilder" class="org.apache.geronimo.j2ee.deployment.SwitchingModuleBuilder">
- <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/web/tomcat</attribute>
+ <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</attribute>
<references name="ModuleBuilders">
<pattern>
<gbean-name>geronimo.deployer:j2eeType=ModuleBuilder,name=JettyWebBuilder,*</gbean-name>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-plan.xml Wed Sep 28 15:09:15 2005
@@ -22,7 +22,7 @@
Configuration for Jetty server.
-->
<configuration
- xmlns="http://geronimo.apache.org/xml/ns/deployment"
+ xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="org/apache/geronimo/Jetty"
parentId="org/apache/geronimo/RMINaming"
>
@@ -36,7 +36,7 @@
they definitely don't belong in the console plan, but could go into
a management layer plan. -->
<gbean name="JettyWebManager" class="org.apache.geronimo.jetty.JettyManagerImpl"/>
-
+
<gbean name="JettyAccessLogManager" class="org.apache.geronimo.jetty.requestlog.JettyLogManagerImpl">
<references name="LogGBeans">
<pattern>
@@ -45,7 +45,7 @@
</pattern>
</references>
</gbean>
-
+
<!-- default WAR container using Jetty -->
<gbean name="JettyWebContainer" class="org.apache.geronimo.jetty.JettyContainerImpl">
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-runtime-deployer-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-runtime-deployer-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-runtime-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-jetty-runtime-deployer-plan.xml Wed Sep 28 15:09:15 2005
@@ -18,7 +18,7 @@
<!-- $Rev: 216115 $ $Date: 2005-07-12 23:22:18 -0600 (Tue, 12 Jul 2005) $ -->
<configuration
- xmlns="http://geronimo.apache.org/xml/ns/deployment"
+ xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="org/apache/geronimo/JettyRuntimeDeployer"
parentId="org/apache/geronimo/RuntimeDeployer"
>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-runtime-deployer-plan.xml Wed Sep 28 15:09:15 2005
@@ -22,7 +22,7 @@
Child of the org/apache/geronimo/Server configuration that includes deployment services
-->
<configuration
- xmlns="http://geronimo.apache.org/xml/ns/deployment"
+ xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="org/apache/geronimo/RuntimeDeployer"
parentId="org/apache/geronimo/Server"
>
@@ -145,7 +145,7 @@
<!-- web switching builder -->
<gbean name="WebBuilder" class="org.apache.geronimo.j2ee.deployment.SwitchingModuleBuilder">
- <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/web/tomcat</attribute>
+ <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</attribute>
<references name="ModuleBuilders">
<pattern><gbean-name>geronimo.server:j2eeType=ModuleBuilder,name=JettyWebBuilder,*</gbean-name></pattern>
<pattern><gbean-name>geronimo.server:j2eeType=ModuleBuilder,name=TomcatWebBuilder,*</gbean-name></pattern>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-secure-plan.xml Wed Sep 28 15:09:15 2005
@@ -25,7 +25,7 @@
web application, for example, does.
-->
<configuration
- xmlns="http://geronimo.apache.org/xml/ns/deployment"
+ xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="org/apache/geronimo/SampleSecurityRealm"
parentId="org/apache/geronimo/Server"
>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-security-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-security-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-security-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-security-plan.xml Wed Sep 28 15:09:15 2005
@@ -22,7 +22,7 @@
Configuration for the security of a Geronimo server.
-->
<configuration
- xmlns="http://geronimo.apache.org/xml/ns/deployment"
+ xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="org/apache/geronimo/Security"
parentId="org/apache/geronimo/RMINaming"
>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-corba-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-server-corba-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-corba-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-corba-plan.xml Wed Sep 28 15:09:15 2005
@@ -23,7 +23,7 @@
-->
<configuration
- xmlns="http://geronimo.apache.org/xml/ns/deployment"
+ xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="org/apache/geronimo/ServerCORBA"
parentId="org/apache/geronimo/Server"
>
@@ -56,7 +56,7 @@
<attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
<attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
<xml-attribute name="tssConfig">
- <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config_1_0" xmlns:sec="http://geronimo.apache.org/xml/ns/security">
+ <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.0">
<tss:default-principal realm-name="public-properties-realm">
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
@@ -84,7 +84,7 @@
<name>Server</name>
</reference>
<xml-attribute name="tssConfig">
- <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config_1_0" xmlns:sec="http://geronimo.apache.org/xml/ns/security">
+ <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.0">
<tss:default-principal realm-name="public-properties-realm">
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
@@ -111,7 +111,7 @@
<name>Server</name>
</reference>
<xml-attribute name="tssConfig">
- <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config_1_0" xmlns:sec="http://geronimo.apache.org/xml/ns/security">
+ <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.0">
<tss:default-principal realm-name="public-properties-realm">
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
@@ -139,7 +139,7 @@
<name>Server</name>
</reference>
<xml-attribute name="tssConfig">
- <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config_1_0" xmlns:sec="http://geronimo.apache.org/xml/ns/security">
+ <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.0">
<tss:default-principal realm-name="public-properties-realm">
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
@@ -179,7 +179,7 @@
<attribute name="args">-ORBInitRef, NameService=corbaloc::${PlanCOSNamingHost}:${PlanCOSNamingPort}/NameService</attribute>
<attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
<xml-attribute name="tssConfig">
- <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config_1_0" xmlns:sec="http://geronimo.apache.org/xml/ns/security">
+ <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.0">
<tss:default-principal realm-name="public-properties-realm">
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
@@ -203,7 +203,7 @@
<name>UnprotectedServer</name>
</reference>
<xml-attribute name="tssConfig">
- <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config_1_0" xmlns:sec="http://geronimo.apache.org/xml/ns/security">
+ <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.0">
<tss:default-principal realm-name="cts-properties-realm">
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
@@ -229,7 +229,7 @@
<name>Server</name>
</reference>
<xml-attribute name="tssConfig">
- <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config_1_0" xmlns:sec="http://geronimo.apache.org/xml/ns/security">
+ <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.0">
<tss:default-principal realm-name="public-properties-realm">
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
@@ -266,7 +266,7 @@
<attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
<attribute name="description">SSLClientCert</attribute>
<xml-attribute name="nssConfig">
- <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config_1_0">
+ <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
<css:compoundSecMechTypeList>
<css:compoundSecMech>
<css:SSL>
@@ -278,7 +278,7 @@
</css:css>
</xml-attribute>
<xml-attribute name="cssConfig">
- <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config_1_0">
+ <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
<css:compoundSecMechTypeList>
<css:compoundSecMech>
<css:SSL>
@@ -306,7 +306,7 @@
<attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
<attribute name="description">SSLClientPassword</attribute>
<xml-attribute name="nssConfig">
- <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config_1_0">
+ <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
<css:compoundSecMechTypeList>
<css:compoundSecMech>
<css:SSL>
@@ -318,7 +318,7 @@
</css:css>
</xml-attribute>
<xml-attribute name="cssConfig">
- <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config_1_0">
+ <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
<css:compoundSecMechTypeList>
<css:compoundSecMech>
<css:SSL>
@@ -347,7 +347,7 @@
<attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
<attribute name="description">SSLIdentityTokenPrincipal</attribute>
<xml-attribute name="nssConfig">
- <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config_1_0">
+ <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
<css:compoundSecMechTypeList>
<css:compoundSecMech>
<css:SSL>
@@ -359,7 +359,7 @@
</css:css>
</xml-attribute>
<xml-attribute name="cssConfig">
- <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config_1_0">
+ <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
<css:compoundSecMechTypeList>
<css:compoundSecMech>
<css:SSL>
@@ -387,7 +387,7 @@
<attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
<attribute name="description">SSLIdentityTokenCert</attribute>
<xml-attribute name="nssConfig">
- <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config_1_0">
+ <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
<css:compoundSecMechTypeList>
<css:compoundSecMech>
<css:SSL>
@@ -399,7 +399,7 @@
</css:css>
</xml-attribute>
<xml-attribute name="cssConfig">
- <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config_1_0">
+ <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
<css:compoundSecMechTypeList>
<css:compoundSecMech>
<css:SSL>
@@ -427,7 +427,7 @@
<attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
<attribute name="description">NoSecurityIdentityTokenPrincipal</attribute>
<xml-attribute name="nssConfig">
- <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config_1_0">
+ <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
<css:compoundSecMechTypeList>
<css:compoundSecMech>
<css:SSL>
@@ -439,7 +439,7 @@
</css:css>
</xml-attribute>
<xml-attribute name="cssConfig">
- <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config_1_0">
+ <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
<css:compoundSecMechTypeList>
<css:compoundSecMech>
<css:sasMech>
@@ -463,7 +463,7 @@
<attribute name="configAdapter">org.openejb.corba.sunorb.SunORBConfigAdapter</attribute>
<attribute name="description">NoSecurityIdentityTokenCert</attribute>
<xml-attribute name="nssConfig">
- <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config_1_0">
+ <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
<css:compoundSecMechTypeList>
<css:compoundSecMech>
<css:SSL>
@@ -475,7 +475,7 @@
</css:css>
</xml-attribute>
<xml-attribute name="cssConfig">
- <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config_1_0">
+ <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
<css:compoundSecMechTypeList>
<css:compoundSecMech>
<css:sasMech>
@@ -500,7 +500,7 @@
<attribute name="description">NoSecurity</attribute>
<attribute name="cssArgs"></attribute>
<xml-attribute name="cssConfig">
- <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config_1_0">
+ <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
<css:compoundSecMechTypeList>
<css:compoundSecMech>
<css:SSL>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-server-plan.xml Wed Sep 28 15:09:15 2005
@@ -25,7 +25,7 @@
by the server.
-->
<configuration
- xmlns="http://geronimo.apache.org/xml/ns/deployment"
+ xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="org/apache/geronimo/Server"
parentId="org/apache/geronimo/RMINaming"
>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-plan.xml Wed Sep 28 15:09:15 2005
@@ -22,7 +22,7 @@
Configuration for Tomcat server.
-->
<configuration
- xmlns="http://geronimo.apache.org/xml/ns/deployment"
+ xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="org/apache/geronimo/Tomcat"
parentId="org/apache/geronimo/RMINaming"
>
Modified: geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-runtime-deployer-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-runtime-deployer-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-runtime-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/j2ee-tomcat-runtime-deployer-plan.xml Wed Sep 28 15:09:15 2005
@@ -19,7 +19,7 @@
<!-- $Rev: 216115 $ $Date: 2005-07-12 23:22:18 -0600 (Tue, 12 Jul 2005) $ -->
<configuration
- xmlns="http://geronimo.apache.org/xml/ns/deployment"
+ xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="org/apache/geronimo/TomcatRuntimeDeployer"
parentId="org/apache/geronimo/RuntimeDeployer"
>
Modified: geronimo/trunk/modules/assembly/src/plan/naming-server-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/naming-server-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/naming-server-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/naming-server-plan.xml Wed Sep 28 15:09:15 2005
@@ -23,7 +23,7 @@
after the system GBeans but before the server GBeans.
-->
<configuration
- xmlns="http://geronimo.apache.org/xml/ns/deployment"
+ xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="org/apache/geronimo/RMINaming"
parentId="org/apache/geronimo/System"
>
Modified: geronimo/trunk/modules/assembly/src/plan/spring-deployer-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/spring-deployer-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/spring-deployer-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/spring-deployer-plan.xml Wed Sep 28 15:09:15 2005
@@ -19,7 +19,7 @@
<!-- $Rev: 126313 $ $Date: 2005-01-24 21:03:52 +0000 (Mon, 24 Jan 2005) $ -->
<configuration
- xmlns="http://geronimo.apache.org/xml/ns/deployment"
+ xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="org/apache/geronimo/SpringDeployer"
parentId="org/apache/geronimo/SpringRuntime"
>
Modified: geronimo/trunk/modules/assembly/src/plan/spring-runtime-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/spring-runtime-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/spring-runtime-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/spring-runtime-plan.xml Wed Sep 28 15:09:15 2005
@@ -19,7 +19,7 @@
<!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
<configuration
- xmlns="http://geronimo.apache.org/xml/ns/deployment"
+ xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="org/apache/geronimo/SpringRuntime"
parentId="org/apache/geronimo/System"
>
Modified: geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-activemq-plan.xml Wed Sep 28 15:09:15 2005
@@ -19,7 +19,7 @@
<!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
<configuration
- xmlns="http://geronimo.apache.org/xml/ns/deployment"
+ xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="org/apache/geronimo/ActiveMQServer"
parentId="org/apache/geronimo/SystemDatabase">
Modified: geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-database-plan.xml Wed Sep 28 15:09:15 2005
@@ -18,7 +18,7 @@
<!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
configId="org/apache/geronimo/SystemDatabase"
parentId="org/apache/geronimo/Server">
Modified: geronimo/trunk/modules/assembly/src/plan/system-jms-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-jms-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-jms-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-jms-plan.xml Wed Sep 28 15:09:15 2005
@@ -18,7 +18,7 @@
<!-- $Rev: 47568 $ $Date: 2004-09-30 01:21:54 -0700 (Thu, 30 Sep 2004) $ -->
-<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector"
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"
configId="org/apache/geronimo/SystemJMS"
parentId="org/apache/geronimo/ActiveMQServer">
<resourceadapter>
Modified: geronimo/trunk/modules/assembly/src/plan/system-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/system-plan.xml?rev=292333&r1=292332&r2=292333&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-plan.xml (original)
+++ geronimo/trunk/modules/assembly/src/plan/system-plan.xml Wed Sep 28 15:09:15 2005
@@ -6,16 +6,16 @@
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
-
+
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.
-->
-
+
<!--
Configuration for the innermost ring of a Geronimo server.
@@ -27,7 +27,7 @@
specific services - those should be provided by children.
-->
<configuration
- xmlns="http://geronimo.apache.org/xml/ns/deployment"
+ xmlns="http://geronimo.apache.org/xml/ns/deployment-1.0"
configId="org/apache/geronimo/System"
domain="geronimo.server"
server="geronimo"
Added: geronimo/trunk/modules/assembly/src/plan/uddi-server-jetty-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/uddi-server-jetty-plan.xml?rev=292333&view=auto
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/uddi-server-jetty-plan.xml (added)
+++ geronimo/trunk/modules/assembly/src/plan/uddi-server-jetty-plan.xml Wed Sep 28 15:09:15 2005
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2004 The Apache Software Foundation
+
+ 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
+
+ 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.
+-->
+
+<!-- $Rev: 160900 $ $Date: 2005-04-11 08:09:38 -0700 (Mon, 11 Apr 2005) $ -->
+
+<web-app
+ xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
+ configId="org/apache/geronimo/juddiServer/${pom.currentVersion}/Jetty"
+ parentId="org/apache/geronimo/SystemDatabase"
+ >
+
+ <dependency>
+ <uri>juddi/jars/juddi-${juddi_version}.jar</uri>
+ </dependency>
+
+ <context-root>/juddi</context-root>
+ <context-priority-classloader>false</context-priority-classloader>
+ <resource-ref>
+ <ref-name>jdbc/juddiDB</ref-name>
+ <resource-link>SystemDatasource</resource-link>
+ </resource-ref>
+</web-app>
Added: geronimo/trunk/modules/assembly/src/plan/uddi-server-tomcat-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/uddi-server-tomcat-plan.xml?rev=292333&view=auto
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/uddi-server-tomcat-plan.xml (added)
+++ geronimo/trunk/modules/assembly/src/plan/uddi-server-tomcat-plan.xml Wed Sep 28 15:09:15 2005
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2004 The Apache Software Foundation
+
+ 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
+
+ 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.
+-->
+
+<!-- $Rev: 160900 $ $Date: 2005-04-11 08:09:38 -0700 (Mon, 11 Apr 2005) $ -->
+
+<web-app
+ xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
+ configId="org/apache/geronimo/juddiServer/${pom.currentVersion}/Tomcat"
+ parentId="org/apache/geronimo/SystemDatabase"
+ >
+
+ <dependency>
+ <uri>juddi/jars/juddi-${juddi_version}.jar</uri>
+ </dependency>
+
+ <context-root>/juddi</context-root>
+ <context-priority-classloader>false</context-priority-classloader>
+ <resource-ref>
+ <ref-name>jdbc/juddiDB</ref-name>
+ <resource-link>SystemDatasource</resource-link>
+ </resource-ref>
+</web-app>
Added: geronimo/trunk/modules/assembly/src/plan/webconsole-jetty-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/webconsole-jetty-plan.xml?rev=292333&view=auto
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/webconsole-jetty-plan.xml (added)
+++ geronimo/trunk/modules/assembly/src/plan/webconsole-jetty-plan.xml Wed Sep 28 15:09:15 2005
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application
+ xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
+ configId="org/apache/geronimo/Console/Jetty"
+ parentId="org/apache/geronimo/Server">
+
+ <!-- these dependencies must be kept here so that their classes are loaded in the "EARs" classloader. -->
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>${portlet_api_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto</artifactId>
+ <version>${pluto_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-console-core</artifactId>
+ <version>${geronimo_version}</version>
+ </dependency>
+
+ <!-- Keystore dependency -->
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-util</artifactId>
+ <version>${geronimo_version}</version>
+ </dependency>
+ <module>
+ <web>geronimo-console-framework-${pom.currentVersion}.war</web>
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0" configId="console">
+ <context-root>/console</context-root>
+ <context-priority-classloader>false</context-priority-classloader>
+ <security-realm-name>geronimo-properties-realm</security-realm-name>
+ <security>
+ <default-principal realm-name="geronimo-properties-realm">
+ <principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="system"/>
+ </default-principal>
+ <role-mappings>
+ <role role-name="admin">
+ <realm realm-name="geronimo-properties-realm">
+ <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin" designated-run-as="true"/>
+ </realm>
+ </role>
+ </role-mappings>
+ </security>
+ </web-app>
+ </module>
+
+ <module>
+ <web>geronimo-console-standard-${pom.currentVersion}.war</web>
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0" configId="console-standard">
+ <context-root>/console-standard</context-root>
+ <context-priority-classloader>false</context-priority-classloader>
+ </web-app>
+ </module>
+
+ <!-- Console specific server info -->
+ <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
+ <reference name="ServerInfo">
+ <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/System,J2EEServer=geronimo,j2eeType=GBean,name=ServerInfo</gbean-name>
+ </reference>
+ <reference name="LoginModule">
+<!-- <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=LoginModule,name=properties-login</gbean-name>-->
+ <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Security,J2EEServer=geronimo,j2eeType=LoginModule,name=properties-login</gbean-name>
+ </reference>
+ </gbean>
+
+ <!-- Keystore configuration -->
+ <!-- I think this requires a modified GERONIMO-887 to be applied first -->
+<!-- <gbean gbeanName="geronimo.security:type=KeyStore" class="org.apache.geronimo.console.core.keystore.KeyStoreGBean">-->
+<!-- <attribute name="keyStoreLocation">var/security/ssl-keystore-1</attribute>-->
+<!-- <attribute name="keyStoreType">jks</attribute>-->
+<!-- <attribute name="keyStoreProvider">SUN</attribute>-->
+<!-- <attribute name="keyStorePassword">password</attribute>-->
+<!-- <reference name="serverInfo">-->
+<!-- <application>null</application>-->
+<!-- <moduleType>J2EEModule</moduleType>-->
+<!-- <module>org/apache/geronimo/System</module>-->
+<!-- <type>GBean</type>-->
+<!-- <name>ServerInfo</name>-->
+<!-- </reference>-->
+<!-- </gbean>-->
+
+</application>
Added: geronimo/trunk/modules/assembly/src/plan/webconsole-tomcat-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/webconsole-tomcat-plan.xml?rev=292333&view=auto
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/webconsole-tomcat-plan.xml (added)
+++ geronimo/trunk/modules/assembly/src/plan/webconsole-tomcat-plan.xml Wed Sep 28 15:09:15 2005
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application
+ xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.0"
+ configId="org/apache/geronimo/Console/Tomcat"
+ parentId="org/apache/geronimo/Server">
+
+ <!-- these dependencies must be kept here so that their classes are loaded in the "EARs" classloader. -->
+ <dependency>
+ <groupId>portlet-api</groupId>
+ <artifactId>portlet-api</artifactId>
+ <version>${portlet_api_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto</artifactId>
+ <version>${pluto_version}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-console-core</artifactId>
+ <version>${geronimo_version}</version>
+ </dependency>
+
+ <!-- Keystore dependency -->
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-util</artifactId>
+ <version>${geronimo_version}</version>
+ </dependency>
+ <module>
+ <web>geronimo-console-framework-${pom.currentVersion}.war</web>
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0" configId="console">
+ <context-root>/console</context-root>
+ <context-priority-classloader>false</context-priority-classloader>
+ <cross-context/>
+ <security-realm-name>geronimo-properties-realm</security-realm-name>
+ <security>
+ <default-principal realm-name="geronimo-properties-realm">
+ <principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="system"/>
+ </default-principal>
+ <role-mappings>
+ <role role-name="admin">
+ <realm realm-name="geronimo-properties-realm">
+ <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin" designated-run-as="true"/>
+ </realm>
+ </role>
+ </role-mappings>
+ </security>
+ </web-app>
+ </module>
+
+ <module>
+ <web>geronimo-console-standard-${pom.currentVersion}.war</web>
+ <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0" configId="console-standard">
+ <context-root>/console-standard</context-root>
+ <context-priority-classloader>false</context-priority-classloader>
+ <cross-context/>
+ </web-app>
+ </module>
+
+ <!-- Console specific server info -->
+ <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
+ <reference name="ServerInfo">
+ <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/System,J2EEServer=geronimo,j2eeType=GBean,name=ServerInfo</gbean-name>
+ </reference>
+ <reference name="LoginModule">
+ <!-- <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Server,J2EEServer=geronimo,j2eeType=LoginModule,name=properties-login</gbean-name>-->
+ <gbean-name>geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Security,J2EEServer=geronimo,j2eeType=LoginModule,name=properties-login</gbean-name>
+ </reference>
+ </gbean>
+
+ <!-- Keystore configuration -->
+ <!-- I think this requires a modified GERONIMO-887 to be applied first -->
+ <!-- <gbean gbeanName="geronimo.security:type=KeyStore" class="org.apache.geronimo.console.core.keystore.KeyStoreGBean">-->
+ <!-- <attribute name="keyStoreLocation">var/security/ssl-keystore-1</attribute>-->
+ <!-- <attribute name="keyStoreType">jks</attribute>-->
+ <!-- <attribute name="keyStoreProvider">SUN</attribute>-->
+ <!-- <attribute name="keyStorePassword">password</attribute>-->
+ <!-- <reference name="serverInfo">-->
+ <!-- <application>null</application>-->
+ <!-- <moduleType>J2EEModule</moduleType>-->
+ <!-- <module>org/apache/geronimo/System</module>-->
+ <!-- <type>GBean</type>-->
+ <!-- <name>ServerInfo</name>-->
+ <!-- </reference>-->
+ <!-- </gbean>-->
+
+</application>
Added: geronimo/trunk/modules/assembly/src/plan/welcome-jetty-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/welcome-jetty-plan.xml?rev=292333&view=auto
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/welcome-jetty-plan.xml (added)
+++ geronimo/trunk/modules/assembly/src/plan/welcome-jetty-plan.xml Wed Sep 28 15:09:15 2005
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2005 The Apache Software Foundation
+
+ 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
+
+ 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.
+-->
+
+<!-- $Rev: 160900 $ $Date: 2005-04-11 08:09:38 -0700 (Mon, 11 Apr 2005) $ -->
+
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0"
+ configId="org/apache/geronimo/applications/Welcome/Jetty"
+ parentId="org/apache/geronimo/Server"
+ >
+
+ <context-root>/</context-root>
+ <context-priority-classloader>false</context-priority-classloader>
+</web-app>
Added: geronimo/trunk/modules/assembly/src/plan/welcome-tomcat-plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/plan/welcome-tomcat-plan.xml?rev=292333&view=auto
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/welcome-tomcat-plan.xml (added)
+++ geronimo/trunk/modules/assembly/src/plan/welcome-tomcat-plan.xml Wed Sep 28 15:09:15 2005
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright 2005 The Apache Software Foundation
+
+ 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
+
+ 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.
+-->
+
+<!-- $Rev: 160900 $ $Date: 2005-04-11 08:09:38 -0700 (Mon, 11 Apr 2005) $ -->
+
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0"
+ configId="org/apache/geronimo/applications/Welcome/Tomcat"
+ parentId="org/apache/geronimo/Server"
+ >
+
+ <context-root>/</context-root>
+ <context-priority-classloader>false</context-priority-classloader>
+</web-app>
Added: geronimo/trunk/modules/assembly/src/var/config/config.jetty.list
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/config/config.jetty.list?rev=292333&view=auto
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.jetty.list (added)
+++ geronimo/trunk/modules/assembly/src/var/config/config.jetty.list Wed Sep 28 15:09:15 2005
@@ -0,0 +1,10 @@
+org/apache/geronimo/System
+org/apache/geronimo/RMINaming
+org/apache/geronimo/Server
+org/apache/geronimo/Security
+org/apache/geronimo/SystemDatabase
+org/apache/geronimo/SystemJMS
+org/apache/geronimo/RuntimeDeployer
+org/apache/geronimo/JettyRuntimeDeployer
+org/apache/geronimo/applications/Welcome/Jetty
+org/apache/geronimo/Console/Jetty
Added: geronimo/trunk/modules/assembly/src/var/config/config.jetty.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/src/var/config/config.jetty.xml?rev=292333&view=auto
==============================================================================
--- geronimo/trunk/modules/assembly/src/var/config/config.jetty.xml (added)
+++ geronimo/trunk/modules/assembly/src/var/config/config.jetty.xml Wed Sep 28 15:09:15 2005
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<attributes>
+ <configuration name="org/apache/geronimo/RMINaming">
+ <gbean name="RMIRegistry">
+ <attribute name="port">${PlanNamingPort}</attribute>
+ </gbean>
+ <gbean name="NamingProperties">
+ <!-- Check whether this really works if host name is 0.0.0.0 -->
+ <attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>
+ </gbean>
+ </configuration>
+ <configuration name="org/apache/geronimo/OfflineDeployer">
+ <gbean name="WebBuilder">
+ <attribute name="defaultNamespace">${PlanJettyWebBuilderDefaultNamespace}</attribute>
+ </gbean>
+ <gbean name="EJBBuilder">
+ <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Jetty,J2EEServer=geronimo,j2eeType=GBean,name=${PlanWebServerName}WebContainer</attribute>
+ </gbean>
+ </configuration>
+ <configuration name="org/apache/geronimo/RuntimeDeployer">
+ <gbean name="WebBuilder">
+ <attribute name="defaultNamespace">${PlanJettyWebBuilderDefaultNamespace}</attribute>
+ </gbean>
+ <gbean name="EJBBuilder">
+ <attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=org/apache/geronimo/Jetty,J2EEServer=geronimo,j2eeType=GBean,name=${PlanWebServerName}WebContainer</attribute>
+ </gbean>
+ </configuration>
+ <configuration name="org/apache/geronimo/Jetty">
+ <gbean name="JettyWebConnector">
+ <attribute name="host">${PlanServerHostname}</attribute>
+ <attribute name="port">${PlanHTTPPortPrimary}</attribute>
+ <attribute name="redirectPort">${PlanHTTPSPortPrimary}</attribute>
+ </gbean>
+ <gbean name="JettySSLConnector">
+ <attribute name="host">${PlanServerHostname}</attribute>
+ <attribute name="port">${PlanHTTPSPortPrimary}</attribute>
+ </gbean>
+ </configuration>
+ <configuration name="org/apache/geronimo/Tomcat">
+ <gbean name="TomcatWebConnector">
+ <attribute name="host">${PlanServerHostname}</attribute>
+ <attribute name="port">${PlanHTTPPortSecondary}</attribute>
+ <attribute name="redirectPort">${PlanHTTPSPortSecondary}</attribute>
+ </gbean>
+ <gbean name="TomcatAJPConnector">
+ <attribute name="host">${PlanServerHostname}</attribute>
+ <attribute name="port">${PlanAJPPortSecondary}</attribute>
+ <attribute name="redirectPort">${PlanHTTPSPortSecondary}</attribute>
+ </gbean>
+ <gbean name="TomcatWebSSLConnector">
+ <attribute name="host">${PlanServerHostname}</attribute>
+ <attribute name="port">${PlanHTTPSPortSecondary}</attribute>
+ </gbean>
+ </configuration>
+ <configuration name="org/apache/geronimo/Server">
+ <gbean name="openejb:type=NetworkService,name=EJB">
+ <attribute name="host">${PlanServerHostname}</attribute>
+ <attribute name="port">${PlanOpenEJBPort}</attribute>
+ </gbean>
+ </configuration>
+ <configuration name="org/apache/geronimo/Security">
+ <gbean name="geronimo.remoting:target=JaasLoginServiceRemotingServer">
+ <attribute name="host">${PlanServerHostname}</attribute>
+ <attribute name="port">${PlanRemoteLoginPort}</attribute>
+ </gbean>
+ <gbean name="JMXConnector">
+ <attribute name="url">service:jmx:rmi://${PlanServerHostname}/jndi/rmi:/JMXConnector</attribute>
+ </gbean>
+ <!-- Add CORBA settings PlanIIOPPort, PlanORBPort, PlanCOSNamingPort -->
+ </configuration>
+ <configuration name="org/apache/geronimo/ActiveMQServer">
+ <gbean name="ActiveMQ.tcp.default">
+ <attribute name="host">${PlanServerHostname}</attribute>
+ <attribute name="port">${PlanActiveMQPort}</attribute>
+ </gbean>
+ </configuration>
+ <configuration name="org/apache/geronimo/SystemDatabase">
+ <gbean name="DerbyNetwork">
+ <attribute name="host">${PlanServerHostname}</attribute>
+ <attribute name="port">${PlanDerbyPort}</attribute>
+ </gbean>
+ </configuration>
+ <configuration name="org/apache/geronimo/Directory">
+ <gbean name="geronimo.server:name=DirectoryService">
+ <attribute name="host">${PlanServerHostname}</attribute>
+ <attribute name="port">${PlanLdapPort}</attribute>
+ </gbean>
+ </configuration>
+</attributes>