You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2008/07/18 23:42:37 UTC
svn commit: r678049 - in /geronimo/samples/branches/2.1/samples:
app-per-port/app-per-port-tomcat/src/main/plan/plan.xml app-per-port/src/
pom.xml
Author: jbohn
Date: Fri Jul 18 14:42:36 2008
New Revision: 678049
URL: http://svn.apache.org/viewvc?rev=678049&view=rev
Log:
merge rev.664199 in samples/trunk - GERONIMO-4109 reverse non-default host-engine relationship - there are still more issues with ERROR and WARNING messages ... but at least the sample installs and seems to work with these changes
Removed:
geronimo/samples/branches/2.1/samples/app-per-port/src/
Modified:
geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-tomcat/src/main/plan/plan.xml
geronimo/samples/branches/2.1/samples/pom.xml
Modified: geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-tomcat/src/main/plan/plan.xml?rev=678049&r1=678048&r2=678049&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/2.1/samples/app-per-port/app-per-port-tomcat/src/main/plan/plan.xml Fri Jul 18 14:42:36 2008
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--
Copyright 2004-2005 The Apache Software Foundation
@@ -65,7 +66,7 @@
<gbean name="TomcatWebConnector2" class="org.apache.geronimo.tomcat.connector.Http11NIOConnectorGBean">
<attribute name="name">HTTP</attribute>
<attribute name="host">localhost</attribute>
- <attribute name="port">8082</attribute>
+ <attribute name="port">8091</attribute>
<attribute name="maxHttpHeaderSize">8192</attribute>
<attribute name="maxThreads">150</attribute>
<attribute name="minSpareThreads">25</attribute>
@@ -114,7 +115,7 @@
</pattern>
</references>
<reference name="RealmGBean">
- <name>TomcatJAASRealm</name>
+ <name>NoSecurityRealm</name>
</reference>
<!--reference name="TomcatValveChain">
<name>FirstValve</name>
@@ -124,9 +125,9 @@
<gbean name="TomcatHost1" class="org.apache.geronimo.tomcat.HostGBean">
<attribute name="className">org.apache.catalina.core.StandardHost</attribute>
<attribute name="initParams">
- name=localhost
+ name=localhost1
appBase=
- workDir=work
+ workDir=work1
</attribute>
</gbean>
@@ -157,7 +158,7 @@
</pattern>
</references>
<reference name="RealmGBean">
- <name>TomcatJAASRealm</name>
+ <name>NoSecurityRealm</name>
</reference>
<!--reference name="TomcatValveChain">
<name>FirstValve</name>
@@ -167,11 +168,15 @@
<gbean name="TomcatHost2" class="org.apache.geronimo.tomcat.HostGBean">
<attribute name="className">org.apache.catalina.core.StandardHost</attribute>
<attribute name="initParams">
- name=localhost
+ name=localhost2
appBase=
- workDir=work
+ workDir=work2
</attribute>
</gbean>
+ <gbean name="NoSecurityRealm" class="org.apache.geronimo.tomcat.RealmGBean">
+ <attribute name="className">org.apache.geronimo.tomcat.realm.TomcatEJBWSGeronimoRealm</attribute>
+ </gbean>
+
</application>
Modified: geronimo/samples/branches/2.1/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/pom.xml?rev=678049&r1=678048&r2=678049&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/pom.xml Fri Jul 18 14:42:36 2008
@@ -32,8 +32,6 @@
</description>
<properties>
- <!--<geronimoVersion>2.1.2-SNAPSHOT</geronimoVersion>-->
-
<gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${geronimoVersion}/car</gbeanDeployerBootstrap>
<gbeanDeployer>org.apache.geronimo.framework/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
<j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
@@ -48,7 +46,6 @@
<jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jetty6Deployer>
<jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
<jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car</jpaDeployer>
-
</properties>
<modules>