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 2008/09/30 04:21:28 UTC
svn commit: r700326 - in /geronimo/sandbox/failover: ./
failover-tomcat-demo/ failover-tomcat-demo/src/
failover-tomcat-demo/src/main/ failover-tomcat-demo/src/main/assembly/
failover-tomcat-demo/src/main/resources/
failover-tomcat-demo/src/main/resour...
Author: djencks
Date: Mon Sep 29 19:21:27 2008
New Revision: 700326
URL: http://svn.apache.org/viewvc?rev=700326&view=rev
Log:
make a packaging project for the whole demo. All the scripts need to have proper run permissions still
Added:
geronimo/sandbox/failover/failover-tomcat-demo/
geronimo/sandbox/failover/failover-tomcat-demo/pom.xml (with props)
geronimo/sandbox/failover/failover-tomcat-demo/src/
geronimo/sandbox/failover/failover-tomcat-demo/src/main/
geronimo/sandbox/failover/failover-tomcat-demo/src/main/assembly/
geronimo/sandbox/failover/failover-tomcat-demo/src/main/assembly/assembly.xml (with props)
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/README.txt
- copied unchanged from r700283, geronimo/sandbox/failover/README.txt
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/all.sh
- copied unchanged from r700283, geronimo/sandbox/failover/all.sh
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/cycleservers.sh
- copied unchanged from r700289, geronimo/sandbox/failover/cycleservers.sh
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/deploy.gsh
- copied, changed from r700283, geronimo/sandbox/failover/deploy.gsh
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/grinder-3.0.1/
- copied from r700283, geronimo/sandbox/failover/grinder-3.0.1/
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/grinder-3.0.1/AUTHORS
- copied unchanged from r700325, geronimo/sandbox/failover/grinder-3.0.1/AUTHORS
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/grinder-3.0.1/CHANGES
- copied unchanged from r700325, geronimo/sandbox/failover/grinder-3.0.1/CHANGES
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/grinder-3.0.1/LICENSE
- copied unchanged from r700325, geronimo/sandbox/failover/grinder-3.0.1/LICENSE
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/grinder-3.0.1/LICENSE-HTTPClient
- copied unchanged from r700325, geronimo/sandbox/failover/grinder-3.0.1/LICENSE-HTTPClient
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/grinder-3.0.1/LICENSE-Jython
- copied unchanged from r700325, geronimo/sandbox/failover/grinder-3.0.1/LICENSE-Jython
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/grinder-3.0.1/LICENSE-PicoContainer
- copied unchanged from r700325, geronimo/sandbox/failover/grinder-3.0.1/LICENSE-PicoContainer
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/grinder-3.0.1/LICENSE-jEditSyntax
- copied unchanged from r700325, geronimo/sandbox/failover/grinder-3.0.1/LICENSE-jEditSyntax
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/grinder-3.0.1/README
- copied unchanged from r700325, geronimo/sandbox/failover/grinder-3.0.1/README
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/grinder-3.0.1/bin/
- copied from r700325, geronimo/sandbox/failover/grinder-3.0.1/bin/
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/grinder-3.0.1/contrib/
- copied from r700325, geronimo/sandbox/failover/grinder-3.0.1/contrib/
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/grinder-3.0.1/etc/
- copied from r700325, geronimo/sandbox/failover/grinder-3.0.1/etc/
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/grinder-3.0.1/examples/
- copied from r700325, geronimo/sandbox/failover/grinder-3.0.1/examples/
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/grinder-3.0.1/grinder.properties
- copied unchanged from r700325, geronimo/sandbox/failover/grinder-3.0.1/grinder.properties
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/grinder-3.0.1/grinder.py
- copied unchanged from r700325, geronimo/sandbox/failover/grinder-3.0.1/grinder.py
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/grinder-3.0.1/lib/
- copied from r700325, geronimo/sandbox/failover/grinder-3.0.1/lib/
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/grinder-3.0.1/logs/
- copied from r700325, geronimo/sandbox/failover/grinder-3.0.1/logs/
geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/servers.sh
- copied unchanged from r700283, geronimo/sandbox/failover/servers.sh
geronimo/sandbox/failover/load-beans/src/main/resources/META-INF/openejb-jar.xml (with props)
Removed:
geronimo/sandbox/failover/README.txt
geronimo/sandbox/failover/all.sh
geronimo/sandbox/failover/cycleservers.sh
geronimo/sandbox/failover/deploy.gsh
geronimo/sandbox/failover/grinder-3.0.1/
geronimo/sandbox/failover/load-beans/src/test/java/org/superbiz/load/LoadTest.java
geronimo/sandbox/failover/load-beans/target/
geronimo/sandbox/failover/servers.sh
Added: geronimo/sandbox/failover/failover-tomcat-demo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/failover-tomcat-demo/pom.xml?rev=700326&view=auto
==============================================================================
--- geronimo/sandbox/failover/failover-tomcat-demo/pom.xml (added)
+++ geronimo/sandbox/failover/failover-tomcat-demo/pom.xml Mon Sep 29 19:21:27 2008
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<!-- $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.assemblies</groupId>
+ <artifactId>assemblies</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
+-->
+ <groupId>org.apache.geronimo.failover</groupId>
+ <artifactId>failover-tomcat-demo</artifactId>
+ <version>2.2-SNAPSHOT</version>
+
+ <name>Geronimo Demos :: Failover on Tomcat</name>
+
+ <description>
+ Provides stuff needed to demo plugin "farming" and ejb failover based on a tomcat-console server.
+ </description>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.geronimo.assemblies</groupId>
+ <artifactId>geronimo-plugin-farm-node</artifactId>
+ <version>${geronimo.version}</version>
+ <classifier>bin</classifier>
+ <type>tar.gz</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.assemblies</groupId>
+ <artifactId>geronimo-tomcat-farm-controller</artifactId>
+ <version>${geronimo.version}</version>
+ <classifier>bin</classifier>
+ <type>tar.gz</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.superbiz</groupId>
+ <artifactId>load-beans</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>${project.basedir}/src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>package</id>
+ <phase>attached</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>${project.basedir}/src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <properties>
+ <geronimo.version>2.2-SNAPSHOT</geronimo.version>
+ </properties>
+
+</project>
Propchange: geronimo/sandbox/failover/failover-tomcat-demo/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/failover/failover-tomcat-demo/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/failover/failover-tomcat-demo/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/sandbox/failover/failover-tomcat-demo/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/failover-tomcat-demo/src/main/assembly/assembly.xml?rev=700326&view=auto
==============================================================================
--- geronimo/sandbox/failover/failover-tomcat-demo/src/main/assembly/assembly.xml (added)
+++ geronimo/sandbox/failover/failover-tomcat-demo/src/main/assembly/assembly.xml Mon Sep 29 19:21:27 2008
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<assembly>
+ <id>assembly</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+
+ <includeBaseDirectory>true</includeBaseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org.apache.geronimo.assemblies:geronimo-plugin-farm-node</include>
+ <include>org.apache.geronimo.assemblies:geronimo-tomcat-farm-controller</include>
+ <include>org.superbiz:load-beans</include>
+ </includes>
+ </dependencySet>
+
+ </dependencySets>
+
+</assembly>
Propchange: geronimo/sandbox/failover/failover-tomcat-demo/src/main/assembly/assembly.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/failover/failover-tomcat-demo/src/main/assembly/assembly.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/failover/failover-tomcat-demo/src/main/assembly/assembly.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Copied: geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/deploy.gsh (from r700283, geronimo/sandbox/failover/deploy.gsh)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/deploy.gsh?p2=geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/deploy.gsh&p1=geronimo/sandbox/failover/deploy.gsh&r1=700283&r2=700326&rev=700326&view=diff
==============================================================================
--- geronimo/sandbox/failover/deploy.gsh (original)
+++ geronimo/sandbox/failover/failover-tomcat-demo/src/main/resources/deploy.gsh Mon Sep 29 19:21:27 2008
@@ -1,3 +1,3 @@
#gshell script
-deploy/deploy load-beans/target/load-beans-1.0.jar load-beans/plan.xml --username system --password manager
+deploy/deploy load-beans-1.0.jar --username system --password manager
deploy/farm add -f cluster1 -l pluginList1 -a org.superbiz/load-beans/1.0/car
Added: geronimo/sandbox/failover/load-beans/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/failover/load-beans/src/main/resources/META-INF/openejb-jar.xml?rev=700326&view=auto
==============================================================================
--- geronimo/sandbox/failover/load-beans/src/main/resources/META-INF/openejb-jar.xml (added)
+++ geronimo/sandbox/failover/load-beans/src/main/resources/META-INF/openejb-jar.xml Mon Sep 29 19:21:27 2008
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
+ <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+ <dep:moduleId>
+ <dep:groupId>org.superbiz</dep:groupId>
+ <dep:artifactId>load-beans</dep:artifactId>
+ <dep:version>1.0</dep:version>
+ <dep:type>car</dep:type>
+ </dep:moduleId>
+ </dep:environment>
+</openejb-jar>
Propchange: geronimo/sandbox/failover/load-beans/src/main/resources/META-INF/openejb-jar.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/failover/load-beans/src/main/resources/META-INF/openejb-jar.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/failover/load-beans/src/main/resources/META-INF/openejb-jar.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml