You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2010/05/05 22:40:00 UTC
svn commit: r941475 - in /geronimo/server/trunk: ./ assemblies/
framework/assemblies/ framework/configs/
framework/configs/j2ee-security/src/main/plan/
framework/configs/jmx-security/src/main/plan/
framework/configs/rmi-naming/src/main/plan/ framework/...
Author: rickmcguire
Date: Wed May 5 20:39:59 2010
New Revision: 941475
URL: http://svn.apache.org/viewvc?rev=941475&view=rev
Log:
(GERONIMO-5286) Many irrelevant build properties end up in the manifest
Modified:
geronimo/server/trunk/assemblies/pom.xml
geronimo/server/trunk/framework/assemblies/pom.xml
geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml
geronimo/server/trunk/framework/configs/jmx-security/src/main/plan/plan.xml
geronimo/server/trunk/framework/configs/pom.xml
geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml
geronimo/server/trunk/framework/plugingroups/pom.xml
geronimo/server/trunk/plugingroups/pom.xml
geronimo/server/trunk/plugins/activemq/activemq-ra/src/main/plan/plan.xml
geronimo/server/trunk/plugins/client/client/src/main/plan/plan.xml
geronimo/server/trunk/plugins/client/pom.xml
geronimo/server/trunk/plugins/clustering/clustering/src/main/plan/plan.xml
geronimo/server/trunk/plugins/clustering/farming/src/main/plan/plan.xml
geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/plan/plan.xml
geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/plan/plan.xml
geronimo/server/trunk/plugins/jetty8/jetty8/src/main/plan/plan.xml
geronimo/server/trunk/plugins/openejb/openejb/src/main/plan/plan.xml
geronimo/server/trunk/plugins/pom.xml
geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/plan/plan.xml
geronimo/server/trunk/pom.xml
Modified: geronimo/server/trunk/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/pom.xml?rev=941475&r1=941474&r2=941475&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/pom.xml (original)
+++ geronimo/server/trunk/assemblies/pom.xml Wed May 5 20:39:59 2010
@@ -33,11 +33,6 @@
<name>Geronimo Assemblies</name>
<packaging>pom</packaging>
- <properties>
- <PlanJettyWebBuilderDefaultNamespace>http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0</PlanJettyWebBuilderDefaultNamespace>
- <PlanTomcatWebBuilderDefaultNamespace>http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</PlanTomcatWebBuilderDefaultNamespace>
- </properties>
-
<modules>
<module>geronimo-jetty8-minimal</module>
<module>geronimo-jetty8-javaee6</module>
Modified: geronimo/server/trunk/framework/assemblies/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/assemblies/pom.xml?rev=941475&r1=941474&r2=941475&view=diff
==============================================================================
--- geronimo/server/trunk/framework/assemblies/pom.xml (original)
+++ geronimo/server/trunk/framework/assemblies/pom.xml Wed May 5 20:39:59 2010
@@ -33,11 +33,6 @@
<name>Geronimo Assemblies</name>
<packaging>pom</packaging>
- <properties>
- <PlanJettyWebBuilderDefaultNamespace>http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.0</PlanJettyWebBuilderDefaultNamespace>
- <PlanTomcatWebBuilderDefaultNamespace>http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.0</PlanTomcatWebBuilderDefaultNamespace>
- </properties>
-
<modules>
<module>geronimo-framework</module>
</modules>
Modified: geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml?rev=941475&r1=941474&r2=941475&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/j2ee-security/src/main/plan/plan.xml Wed May 5 20:39:59 2010
@@ -38,9 +38,9 @@
<!-- JMX Remoting -->
<gbean name="JMXService" class="org.apache.geronimo.jmxremoting.JMXConnector">
<attribute name="protocol">rmi</attribute>
- <attribute name="host">${PlanServerHostname}</attribute>
- <attribute name="port">${PlanJMXPort}</attribute>
- <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
+ <attribute name="host">${planServerHostname}</attribute>
+ <attribute name="port">${planJMXPort}</attribute>
+ <attribute name="urlPath">/jndi/rmi://${planServerHostname}:${planNamingPort}/JMXConnector</attribute>
<attribute name="applicationConfigName">geronimo-admin</attribute>
<reference name="MBeanServerReference">
<name>MBeanServerReference</name>
Modified: geronimo/server/trunk/framework/configs/jmx-security/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/jmx-security/src/main/plan/plan.xml?rev=941475&r1=941474&r2=941475&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/jmx-security/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/jmx-security/src/main/plan/plan.xml Wed May 5 20:39:59 2010
@@ -20,9 +20,9 @@
<!-- JMX Remoting -->
<gbean name="JMXSecureConnector" class="org.apache.geronimo.jmxremoting.JMXSecureConnector">
<attribute name="protocol">rmi</attribute>
- <attribute name="host">${PlanServerHostname}</attribute>
- <attribute name="port">${PlanJMXSecurePort}</attribute>
- <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXSecureConnector</attribute>
+ <attribute name="host">${planServerHostname}</attribute>
+ <attribute name="port">${planJMXSecurePort}</attribute>
+ <attribute name="urlPath">/jndi/rmi://${planServerHostname}:${planNamingPort}/JMXSecureConnector</attribute>
<attribute name="applicationConfigName">geronimo-admin</attribute>
<reference name="MBeanServerReference">
<name>MBeanServerReference</name>
Modified: geronimo/server/trunk/framework/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/pom.xml?rev=941475&r1=941474&r2=941475&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/pom.xml (original)
+++ geronimo/server/trunk/framework/configs/pom.xml Wed May 5 20:39:59 2010
@@ -19,19 +19,19 @@
<!-- $Rev$ $Date$ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>framework</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
-
+
<artifactId>configs</artifactId>
<name>Geronimo Framework, Configs</name>
<packaging>pom</packaging>
-
+
<modules>
<module>geronimo-gbean-deployer</module>
<module>geronimo-gbean-deployer-bootstrap</module>
@@ -51,7 +51,7 @@
<module>jmx-security</module>
<module>karaf-framework</module>
</modules>
-
+
<build>
<plugins>
<plugin>
@@ -60,7 +60,7 @@
<!-- Install as extention to allow 'car' packaging to be used. -->
<extensions>true</extensions>
<configuration>
- <systemProperties>
+ <systemProperties>
<geronimo.build.car>true</geronimo.build.car>
</systemProperties>
<archive>
@@ -81,9 +81,9 @@
<geronimo-version>${geronimoVersion}</geronimo-version>
<jvm-version>1.6</jvm-version>
<!--<source-repository>http://www.geronimoplugins.com/repository/geronimo-2.1</source-repository>-->
- <source-repository>${PluginSrcRepoLocal}</source-repository>
- <source-repository>${PluginSrcRepoCentral}</source-repository>
- <source-repository>${PluginSrcRepoApacheSnapshots}</source-repository>
+ <source-repository>${pluginSrcRepoLocal}</source-repository>
+ <source-repository>${pluginSrcRepoCentral}</source-repository>
+ <source-repository>${pluginSrcRepoApacheSnapshots}</source-repository>
<artifact-alias key="${groupId}/${artifactId}//car">${groupId}/${artifactId}/${version}/car</artifact-alias>
</plugin-artifact>
</commonInstance>
Modified: geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml?rev=941475&r1=941474&r2=941475&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml Wed May 5 20:39:59 2010
@@ -23,7 +23,7 @@
<gbean name="WaitForBlueprint" class="org.apache.geronimo.blueprint.WaitForBlueprintGBean"/>
<gbean name="RMIRegistry" class="org.apache.geronimo.kernel.rmi.RMIRegistryService">
- <attribute name="port">${PlanNamingPort}</attribute>
+ <attribute name="port">${planNamingPort}</attribute>
<attribute name="host">${ServerHostname}</attribute>
</gbean>
@@ -56,7 +56,7 @@
<attribute name="maxPoolSize">500</attribute>
<attribute name="poolName">DefaultThreadPool</attribute>
</gbean>
-
+
<gbean name="ConfiguredEncryption" class="org.apache.geronimo.system.util.ConfiguredEncryption">
<reference name="ServerInfo">
<name>ServerInfo</name>
Modified: geronimo/server/trunk/framework/plugingroups/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/plugingroups/pom.xml?rev=941475&r1=941474&r2=941475&view=diff
==============================================================================
--- geronimo/server/trunk/framework/plugingroups/pom.xml (original)
+++ geronimo/server/trunk/framework/plugingroups/pom.xml Wed May 5 20:39:59 2010
@@ -6,18 +6,18 @@
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.
--><!-- @version $Rev$ $Date$ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>framework</artifactId>
@@ -28,7 +28,7 @@
<artifactId>plugingroups</artifactId>
<name>Geronimo Plugin Groups</name>
<packaging>pom</packaging>
-
+
<modules>
<module>framework</module>
</modules>
@@ -60,14 +60,14 @@
<plugin-artifact>
<geronimo-version>${geronimoVersion}</geronimo-version>
<jvm-version>1.6</jvm-version>
- <source-repository>${PluginSrcRepoLocal}</source-repository>
- <source-repository>${PluginSrcRepoCentral}</source-repository>
- <source-repository>${PluginSrcRepoApacheSnapshots}</source-repository>
+ <source-repository>${pluginSrcRepoLocal}</source-repository>
+ <source-repository>${pluginSrcRepoCentral}</source-repository>
+ <source-repository>${pluginSrcRepoApacheSnapshots}</source-repository>
</plugin-artifact>
</commonInstance>
</configuration>
</plugin>
</plugins>
</build>
-
+
</project>
Modified: geronimo/server/trunk/plugingroups/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/pom.xml?rev=941475&r1=941474&r2=941475&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/pom.xml Wed May 5 20:39:59 2010
@@ -6,18 +6,18 @@
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.
--><!-- @version $Rev$ $Date$ --><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.geronimo</groupId>
<artifactId>geronimo</artifactId>
@@ -28,7 +28,7 @@
<artifactId>plugingroups</artifactId>
<name>Geronimo Plugin Groups</name>
<packaging>pom</packaging>
-
+
<modules>
<module>client</module>
<!--<module>clustering-jetty</module>-->
@@ -75,14 +75,14 @@
<plugin-artifact>
<geronimo-version>${geronimoVersion}</geronimo-version>
<jvm-version>1.6</jvm-version>
- <source-repository>${PluginSrcRepoLocal}</source-repository>
- <source-repository>${PluginSrcRepoCentral}</source-repository>
- <source-repository>${PluginSrcRepoApacheSnapshots}</source-repository>
+ <source-repository>${pluginSrcRepoLocal}</source-repository>
+ <source-repository>${pluginSrcRepoCentral}</source-repository>
+ <source-repository>${pluginSrcRepoApacheSnapshots}</source-repository>
</plugin-artifact>
</commonInstance>
</configuration>
</plugin>
</plugins>
</build>
-
+
</project>
Modified: geronimo/server/trunk/plugins/activemq/activemq-ra/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-ra/src/main/plan/plan.xml?rev=941475&r1=941474&r2=941475&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-ra/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-ra/src/main/plan/plan.xml Wed May 5 20:39:59 2010
@@ -23,7 +23,7 @@
<resourceadapter>
<resourceadapter-instance>
<resourceadapter-name>ActiveMQ RA</resourceadapter-name>
- <config-property-setting name="ServerUrl">tcp://${PlanServerHostname}:${PlanActiveMQPort}</config-property-setting>
+ <config-property-setting name="ServerUrl">tcp://${planServerHostname}:${planActiveMQPort}</config-property-setting>
<config-property-setting name="UserName">geronimo</config-property-setting>
<config-property-setting name="Password">geronimo</config-property-setting>
<workmanager>
Modified: geronimo/server/trunk/plugins/client/client/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/client/src/main/plan/plan.xml?rev=941475&r1=941474&r2=941475&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/client/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/client/client/src/main/plan/plan.xml Wed May 5 20:39:59 2010
@@ -24,7 +24,7 @@
<!--<gbean name="NamingProperties" class="org.apache.geronimo.system.properties.NamingProperties">-->
<!--<attribute name="namingFactoryInitial">org.apache.xbean.naming.global.GlobalContextManager</attribute>-->
<!--<attribute name="namingFactoryUrlPkgs">org.apache.xbean.naming</attribute>-->
- <!--<attribute name="namingProviderUrl">rmi://${PlanServerHostname}:${PlanNamingPort}</attribute>-->
+ <!--<attribute name="namingProviderUrl">rmi://${planServerHostname}:${planNamingPort}</attribute>-->
<!--</gbean>-->
<gbean name="JavaGlobalContext" class="org.apache.geronimo.gjndi.FederatedContextGBean">
Modified: geronimo/server/trunk/plugins/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/client/pom.xml?rev=941475&r1=941474&r2=941475&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/client/pom.xml (original)
+++ geronimo/server/trunk/plugins/client/pom.xml Wed May 5 20:39:59 2010
@@ -21,21 +21,21 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>plugins</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
-
+
<artifactId>client</artifactId>
<name>Geronimo Plugins, Client</name>
<packaging>pom</packaging>
-
+
<description>
Client plugin
</description>
-
+
<modules>
<module>client</module>
<module>client-deployer</module>
@@ -55,9 +55,9 @@
<geronimo-version>${geronimoVersion}</geronimo-version>
<jvm-version>1.5</jvm-version>
<jvm-version>1.6</jvm-version>
- <source-repository>${PluginSrcRepoLocal}</source-repository>
- <source-repository>${PluginSrcRepoCentral}</source-repository>
- <source-repository>${PluginSrcRepoApacheSnapshots}</source-repository>
+ <source-repository>${pluginSrcRepoLocal}</source-repository>
+ <source-repository>${pluginSrcRepoCentral}</source-repository>
+ <source-repository>${pluginSrcRepoApacheSnapshots}</source-repository>
<artifact-alias server="client" key="${groupId}/${artifactId}//car">${groupId}/${artifactId}/${version}/car</artifact-alias>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/clustering/clustering/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/clustering/src/main/plan/plan.xml?rev=941475&r1=941474&r2=941475&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/clustering/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/clustering/clustering/src/main/plan/plan.xml Wed May 5 20:39:59 2010
@@ -21,7 +21,7 @@
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
<gbean name="Node" class="org.apache.geronimo.clustering.BasicLocalNode">
- <attribute name="nodeName">${PlanNodeName}</attribute>
+ <attribute name="nodeName">${planNodeName}</attribute>
<reference name="JMXConnector">
<name>JMXService</name>
</reference>
Modified: geronimo/server/trunk/plugins/clustering/farming/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/clustering/farming/src/main/plan/plan.xml?rev=941475&r1=941474&r2=941475&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/clustering/farming/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/clustering/farming/src/main/plan/plan.xml Wed May 5 20:39:59 2010
@@ -75,12 +75,12 @@
<!-- Static Cluster Configuration -->
<gbean name="ClusterInfo" class="org.apache.geronimo.farm.config.BasicClusterInfo">
- <attribute name="name">${PlanClusterName}</attribute>
+ <attribute name="name">${planClusterName}</attribute>
<reference name="NodeInfos"></reference>
</gbean>
<gbean name="NodeInfo" class="org.apache.geronimo.farm.config.BasicNodeInfo">
- <attribute name="name">${PlanClusterNodeName}</attribute>
+ <attribute name="name">${planClusterNodeName}</attribute>
<xml-attribute name="extendedJMXConnectorInfo">
<ns:javabean xmlns:ns="http://geronimo.apache.org/xml/ns/deployment/javabean-1.0" class="org.apache.geronimo.farm.deployment.DeploymentExtendedJMXConnectorInfo">
<ns:property name="username">system</ns:property>
Modified: geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/plan/plan.xml?rev=941475&r1=941474&r2=941475&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/corba/client-corba-yoko/src/main/plan/plan.xml Wed May 5 20:39:59 2010
@@ -42,8 +42,8 @@
<reference name="ConfigAdapter">
<name>ORBConfigAdapter</name>
</reference>
- <attribute name="port">${PlanCOSNamingPort}</attribute>
- <attribute name="host">${PlanCOSNamingHost}</attribute>
+ <attribute name="port">${planCOSNamingPort}</attribute>
+ <attribute name="host">${planCOSNamingHost}</attribute>
<attribute name="local">false</attribute>
</gbean>
Modified: geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/plan/plan.xml?rev=941475&r1=941474&r2=941475&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/corba/j2ee-corba-yoko/src/main/plan/plan.xml Wed May 5 20:39:59 2010
@@ -36,8 +36,8 @@
<reference name="ConfigAdapter">
<name>ORBConfigAdapter</name>
</reference>
- <attribute name="port">${PlanCOSNamingPort}</attribute>
- <attribute name="host">${PlanCOSNamingHost}</attribute>
+ <attribute name="port">${planCOSNamingPort}</attribute>
+ <attribute name="host">${planCOSNamingHost}</attribute>
</gbean>
<gbean name="CORBASSLConfig" class="org.apache.geronimo.corba.security.config.ssl.SSLConfigGBean">
@@ -53,8 +53,8 @@
<!-- connections require SSL, no client cert, client logs in with password, no identity token -->
<gbean name="Server" class="org.apache.geronimo.corba.CORBAEjbBeanGBean">
- <attribute name="host">${PlanORBSSLHost}</attribute>
- <attribute name="port">${PlanORBSSLPort}</attribute>
+ <attribute name="host">${planORBSSLHost}</attribute>
+ <attribute name="port">${planORBSSLPort}</attribute>
<reference name="ConfigAdapter">
<name>ORBConfigAdapter</name>
</reference>
@@ -70,7 +70,7 @@
<!--<tss:default-principal>-->
<!--<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>-->
<!--</tss:default-principal>-->
- <tss:SSL port="${PlanORBSSLPort}" hostname="${PlanORBSSLHost}">
+ <tss:SSL port="${planORBSSLPort}" hostname="${planORBSSLHost}">
<tss:supports>Integrity Confidentiality EstablishTrustInTarget</tss:supports>
<tss:requires>Integrity Confidentiality</tss:requires>
</tss:SSL>
@@ -90,8 +90,8 @@
<!-- orb with no security whatsoever -->
<gbean name="UnprotectedServer" class="org.apache.geronimo.corba.CORBAEjbBeanGBean">
- <attribute name="host">${PlanORBHost}</attribute>
- <attribute name="port">${PlanORBPort}</attribute>
+ <attribute name="host">${planORBHost}</attribute>
+ <attribute name="port">${planORBPort}</attribute>
<reference name="ConfigAdapter">
<name>ORBConfigAdapter</name>
</reference>
@@ -132,7 +132,7 @@
<tss:default-principal>
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
- <tss:SSL port="${PlanORBSSLPort}" hostname="${PlanORBSSLHost}">
+ <tss:SSL port="${planORBSSLPort}" hostname="${planORBSSLHost}">
<tss:supports>Integrity Confidentiality EstablishTrustInTarget EstablishTrustInClient</tss:supports>
<tss:requires>Integrity Confidentiality EstablishTrustInClient</tss:requires>
</tss:SSL>
@@ -159,7 +159,7 @@
<tss:default-principal>
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
- <tss:SSL port="${PlanORBSSLPort}" hostname="${PlanORBSSLHost}">
+ <tss:SSL port="${planORBSSLPort}" hostname="${planORBSSLHost}">
<tss:supports>Integrity Confidentiality EstablishTrustInTarget</tss:supports>
<tss:requires>Integrity Confidentiality</tss:requires>
</tss:SSL>
@@ -187,7 +187,7 @@
<tss:default-principal>
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
- <tss:SSL port="${PlanORBSSLPort}" hostname="${PlanORBSSLHost}">
+ <tss:SSL port="${planORBSSLPort}" hostname="${planORBSSLHost}">
<tss:supports>Integrity Confidentiality EstablishTrustInTarget</tss:supports>
<tss:requires>Integrity Confidentiality</tss:requires>
</tss:SSL>
@@ -243,7 +243,7 @@
<tss:default-principal>
<sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="guest"/>
</tss:default-principal>
- <tss:SSL port="${PlanORBSSLPort}" hostname="${PlanORBSSLHost}">
+ <tss:SSL port="${planORBSSLPort}" hostname="${planORBSSLHost}">
<tss:supports>Integrity Confidentiality EstablishTrustInTarget EstablishTrustInClient</tss:supports>
<tss:requires>Integrity Confidentiality EstablishTrustInClient</tss:requires>
</tss:SSL>
Modified: geronimo/server/trunk/plugins/jetty8/jetty8/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty8/jetty8/src/main/plan/plan.xml?rev=941475&r1=941474&r2=941475&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty8/jetty8/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/jetty8/jetty8/src/main/plan/plan.xml Wed May 5 20:39:59 2010
@@ -62,8 +62,8 @@
</gbean>
<gbean name="JettyWebConnector" class="org.apache.geronimo.jetty8.connector.HTTPSelectChannelConnector">
- <attribute name="host">${PlanServerHostname}</attribute>
- <attribute name="port">${PlanHTTPPort}</attribute>
+ <attribute name="host">${planServerHostname}</attribute>
+ <attribute name="port">${planHTTPPort}</attribute>
<attribute name="headerBufferSizeBytes">8192</attribute>
<reference name="JettyContainer">
<name>JettyWebContainer</name>
@@ -75,8 +75,8 @@
</gbean>
<gbean name="JettyAJP13Connector" class="org.apache.geronimo.jetty8.connector.AJP13Connector">
- <attribute name="host">${PlanServerHostname}</attribute>
- <attribute name="port">${PlanAJPPort}</attribute>
+ <attribute name="host">${planServerHostname}</attribute>
+ <attribute name="port">${planAJPPort}</attribute>
<reference name="JettyContainer">
<name>JettyWebContainer</name>
</reference>
@@ -89,8 +89,8 @@
<!-- DONT USE THIS ONE -->
<!--
<gbean name="JettySSLConnector" class="org.apache.geronimo.jetty8.connector.HTTPSSocketConnector">
- <attribute name="host">${PlanServerHostname}</attribute>
- <attribute name="port">${PlanHTTPSPort}</attribute>
+ <attribute name="host">${planServerHostname}</attribute>
+ <attribute name="port">${planHTTPSPort}</attribute>
<attribute name="keyStore">geronimo-default</attribute>
<attribute name="keyAlias">geronimo</attribute>
<attribute name="trustStore">geronimo-default</attribute>
@@ -111,8 +111,8 @@
-->
<!-- USE THIS ONE -->
<gbean name="JettySSLConnector" class="org.apache.geronimo.jetty8.connector.HTTPSSelectChannelConnector">
- <attribute name="host">${PlanServerHostname}</attribute>
- <attribute name="port">${PlanHTTPSPort}</attribute>
+ <attribute name="host">${planServerHostname}</attribute>
+ <attribute name="port">${planHTTPSPort}</attribute>
<attribute name="headerBufferSizeBytes">8192</attribute>
<attribute name="keyStore">geronimo-default</attribute>
<attribute name="keyAlias">geronimo</attribute>
Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/plan/plan.xml?rev=941475&r1=941474&r2=941475&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/plan/plan.xml Wed May 5 20:39:59 2010
@@ -33,8 +33,8 @@
<attribute name="supportReferenceable">true</attribute>
<attribute name="checkDereferenceDifferent">true</attribute>
<attribute name="assumeDereferenceBound">false</attribute>
- </gbean>
-
+ </gbean>
+
<gbean name="OpenEjbSystem" class="org.apache.geronimo.openejb.OpenEjbSystemGBean">
<reference name="TransactionManager">
<name>TransactionManager</name>
@@ -87,11 +87,11 @@
</gbean>
<gbean name="EJBNetworkService" class="org.apache.geronimo.openejb.EjbDaemonGBean">
- <attribute name="port">${PlanOpenEJBPort}</attribute>
- <attribute name="host">${PlanServerHostname}</attribute>
+ <attribute name="port">${planOpenEJBPort}</attribute>
+ <attribute name="host">${planServerHostname}</attribute>
<attribute name="threads">20</attribute>
- <attribute name="multicastPort">${PlanOpenEJBMulticastPort}</attribute>
- <attribute name="multicastHost">${PlanOpenEJBMulticastHostname}</attribute>
+ <attribute name="multicastPort">${planOpenEJBMulticastPort}</attribute>
+ <attribute name="multicastHost">${planOpenEJBMulticastHostname}</attribute>
<attribute name="clusterName">cluster1</attribute>
<attribute name="enableMulticast">true</attribute>
<dependency>
Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=941475&r1=941474&r2=941475&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Wed May 5 20:39:59 2010
@@ -99,9 +99,9 @@
<geronimo-version>${geronimoVersion}</geronimo-version>
<jvm-version>1.6</jvm-version>
<!--<source-repository>http://www.geronimoplugins.com/repository/geronimo-2.1</source-repository>-->
- <source-repository>${PluginSrcRepoLocal}</source-repository>
- <source-repository>${PluginSrcRepoCentral}</source-repository>
- <source-repository>${PluginSrcRepoApacheSnapshots}</source-repository>
+ <source-repository>${pluginSrcRepoLocal}</source-repository>
+ <source-repository>${pluginSrcRepoCentral}</source-repository>
+ <source-repository>${pluginSrcRepoApacheSnapshots}</source-repository>
<artifact-alias key="${groupId}/${artifactId}//car">${groupId}/${artifactId}/${version}/car</artifact-alias>
</plugin-artifact>
</commonInstance>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/plan/plan.xml?rev=941475&r1=941474&r2=941475&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat7/src/main/plan/plan.xml Wed May 5 20:39:59 2010
@@ -85,8 +85,8 @@
<reference name="Server">
<name>TomcatServer</name>
</reference>
- </gbean>
-
+ </gbean>
+
<gbean name="connectorWrapperGBeanStarter" class="org.apache.geronimo.tomcat.connector.ConnectorWrapperGBeanStarter">
<reference name="Server">
<name>TomcatServer</name>
@@ -103,14 +103,14 @@
<gbean name="TomcatWebConnector" class="org.apache.geronimo.tomcat.connector.Http11ConnectorGBean">
<attribute name="name">HTTP</attribute>
- <attribute name="host">${PlanServerHostname}</attribute>
- <attribute name="port">${PlanHTTPPort}</attribute>
+ <attribute name="host">${planServerHostname}</attribute>
+ <attribute name="port">${planHTTPPort}</attribute>
<attribute name="maxHttpHeaderSize">8192</attribute>
<attribute name="maxThreads">150</attribute>
<attribute name="minSpareThreads">25</attribute>
<attribute name="maxSpareThreads">75</attribute>
<attribute name="enableLookups">false</attribute>
- <attribute name="redirectPort">${PlanHTTPSPort}</attribute>
+ <attribute name="redirectPort">${planHTTPSPort}</attribute>
<attribute name="acceptCount">100</attribute>
<attribute name="connectionTimeout">20000</attribute>
<attribute name="disableUploadTimeout">true</attribute>
@@ -124,12 +124,12 @@
<gbean name="TomcatAJPConnector" class="org.apache.geronimo.tomcat.connector.AJP13ConnectorGBean">
<attribute name="name">AJP</attribute>
- <attribute name="host">${PlanServerHostname}</attribute>
- <attribute name="port">${PlanAJPPort}</attribute>
+ <attribute name="host">${planServerHostname}</attribute>
+ <attribute name="port">${planAJPPort}</attribute>
<attribute name="minSpareThreads">25</attribute>
<attribute name="maxSpareThreads">75</attribute>
<attribute name="enableLookups">false</attribute>
- <attribute name="redirectPort">${PlanHTTPSPort}</attribute>
+ <attribute name="redirectPort">${planHTTPSPort}</attribute>
<reference name="TomcatContainer">
<name>TomcatWebContainer</name>
</reference>
@@ -140,8 +140,8 @@
<gbean name="TomcatWebSSLConnector" class="org.apache.geronimo.tomcat.connector.Https11ConnectorGBean">
<attribute name="name">HTTPS</attribute>
- <attribute name="host">${PlanServerHostname}</attribute>
- <attribute name="port">${PlanHTTPSPort}</attribute>
+ <attribute name="host">${planServerHostname}</attribute>
+ <attribute name="port">${planHTTPSPort}</attribute>
<attribute name="maxHttpHeaderSize">8192</attribute>
<attribute name="maxThreads">150</attribute>
<attribute name="minSpareThreads">25</attribute>
@@ -196,7 +196,7 @@
<gbean name="AccessLogValve" class="org.apache.geronimo.tomcat.ValveGBean">
<attribute name="className">org.apache.catalina.valves.AccessLogValve</attribute>
<attribute name="initParams">
- prefix=${PlanServerHostname}_access_log.
+ prefix=${planServerHostname}_access_log.
suffix=.txt
pattern=common
</attribute>
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=941475&r1=941474&r2=941475&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed May 5 20:39:59 2010
@@ -103,33 +103,30 @@
<jpaDeployer>org.apache.geronimo.configs/persistence-jpa20-deployer/${version}/car</jpaDeployer>
<!-- Common plan properties -->
- <PlanServerHostname>0.0.0.0</PlanServerHostname>
- <PlanRemoteDeployHostname>127.0.0.1</PlanRemoteDeployHostname>
- <PlanClientAddresses>127.0.0.1</PlanClientAddresses>
- <PlanHTTPPort>8080</PlanHTTPPort>
- <PlanHTTPSPort>8443</PlanHTTPSPort>
- <PlanAJPPort>8019</PlanAJPPort>
- <PlanOpenEJBPort>4201</PlanOpenEJBPort>
- <PlanOpenEJBMulticastPort>6142</PlanOpenEJBMulticastPort>
- <PlanOpenEJBMulticastHostname>239.255.3.2</PlanOpenEJBMulticastHostname>
- <PlanNamingPort>1099</PlanNamingPort>
- <PlanActiveMQPort>61616</PlanActiveMQPort>
- <PlanCOSNamingHost>localhost</PlanCOSNamingHost>
- <PlanCOSNamingPort>1050</PlanCOSNamingPort>
- <PlanCOSSunNamingPort>1050</PlanCOSSunNamingPort>
- <PlanORBHost>localhost</PlanORBHost>
- <PlanORBPort>6882</PlanORBPort>
- <PlanORBSunPort>6882</PlanORBSunPort>
- <PlanORBSSLHost>localhost</PlanORBSSLHost>
- <PlanORBSSLPort>2001</PlanORBSSLPort>
- <PlanORBSunSSLPort>2001</PlanORBSunSSLPort>
- <PlanJMXPort>9999</PlanJMXPort>
- <PlanJMXSecurePort>9998</PlanJMXSecurePort>
+ <planServerHostname>0.0.0.0</planServerHostname>
+ <planHTTPPort>8080</planHTTPPort>
+ <planHTTPSPort>8443</planHTTPSPort>
+ <planAJPPort>8019</planAJPPort>
+ <planOpenEJBPort>4201</planOpenEJBPort>
+ <planOpenEJBMulticastPort>6142</planOpenEJBMulticastPort>
+ <planOpenEJBMulticastHostname>239.255.3.2</planOpenEJBMulticastHostname>
+ <planNamingPort>1099</planNamingPort>
+ <planActiveMQPort>61616</planActiveMQPort>
+ <planCOSNamingHost>localhost</planCOSNamingHost>
+ <planCOSNamingPort>1050</planCOSNamingPort>
+ <planORBHost>localhost</planORBHost>
+ <planORBPort>6882</planORBPort>
+ <planORBSunPort>6882</planORBSunPort>
+ <planORBSSLHost>localhost</planORBSSLHost>
+ <planORBSSLPort>2001</planORBSSLPort>
+ <planORBSunSSLPort>2001</planORBSunSSLPort>
+ <planJMXPort>9999</planJMXPort>
+ <planJMXSecurePort>9998</planJMXSecurePort>
<!-- Plugins source-repository list-->
- <PluginSrcRepoLocal>~/.m2/repository/</PluginSrcRepoLocal>
- <PluginSrcRepoCentral>http://repo1.maven.org/maven2/</PluginSrcRepoCentral>
- <PluginSrcRepoApacheSnapshots>http://repository.apache.org/snapshots/</PluginSrcRepoApacheSnapshots>
+ <pluginSrcRepoLocal>~/.m2/repository/</pluginSrcRepoLocal>
+ <pluginSrcRepoCentral>http://repo1.maven.org/maven2/</pluginSrcRepoCentral>
+ <pluginSrcRepoApacheSnapshots>http://repository.apache.org/snapshots/</pluginSrcRepoApacheSnapshots>
</properties>
<dependencyManagement>