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/11/05 01:26:38 UTC
svn commit: r711477 - in /geronimo/sandbox/djencks/samples/admin/failover:
./ geronimo-jetty-farm-controller/ load-beans-plugin/
load-beans-plugin/src/ load-beans-plugin/src/main/
load-beans-plugin/src/main/history/ load-beans-plugin/src/main/plan/ loa...
Author: djencks
Date: Tue Nov 4 16:26:38 2008
New Revision: 711477
URL: http://svn.apache.org/viewvc?rev=711477&view=rev
Log:
build sample app into plugin
Added:
geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/
geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/pom.xml (with props)
geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/src/
geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/src/main/
geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/src/main/history/
geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/src/main/history/dependencies.xml (with props)
geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/src/main/plan/
geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/src/main/plan/plan.xml (with props)
geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/src/main/resources/
Modified:
geronimo/sandbox/djencks/samples/admin/failover/geronimo-jetty-farm-controller/pom.xml
geronimo/sandbox/djencks/samples/admin/failover/load-beans/pom.xml
geronimo/sandbox/djencks/samples/admin/failover/pom.xml
Modified: geronimo/sandbox/djencks/samples/admin/failover/geronimo-jetty-farm-controller/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/samples/admin/failover/geronimo-jetty-farm-controller/pom.xml?rev=711477&r1=711476&r2=711477&view=diff
==============================================================================
--- geronimo/sandbox/djencks/samples/admin/failover/geronimo-jetty-farm-controller/pom.xml (original)
+++ geronimo/sandbox/djencks/samples/admin/failover/geronimo-jetty-farm-controller/pom.xml Tue Nov 4 16:26:38 2008
@@ -48,6 +48,21 @@
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>plugin-farm</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.plugins</groupId>
+ <artifactId>console-jetty</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+<!--
+ <dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
<artifactId>web-jetty</artifactId>
<version>${version}</version>
@@ -88,6 +103,7 @@
<version>${version}</version>
<type>car</type>
</dependency>
+ -->
<!--
<dependency>
<groupId>org.apache.geronimo.plugingroups</groupId>
@@ -97,6 +113,7 @@
</dependency>
-->
<!-- stuff not from above plugingroups, yet in jetty-javaee5 assembly -->
+ <!--
<dependency>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>activemq-console-jetty</artifactId>
@@ -154,7 +171,7 @@
<version>${version}</version>
<type>car</type>
</dependency>
-
+-->
</dependencies>
<build>
Added: geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/pom.xml?rev=711477&view=auto
==============================================================================
--- geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/pom.xml (added)
+++ geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/pom.xml Tue Nov 4 16:26:38 2008
@@ -0,0 +1,75 @@
+<?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">
+ <parent>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>failover-nexus-sample</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>load-beans-plugin</artifactId>
+ <packaging>car</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.superbiz</groupId>
+ <artifactId>load-beans</artifactId>
+ <type>jar</type>
+ <version>2.2-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb-deployer</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <configuration>
+ <deploymentConfigs>
+ <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+ <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+ <deploymentConfig>${openejbDeployer}</deploymentConfig>
+ </deploymentConfigs>
+ <module>
+ <groupId>org.superbiz</groupId>
+ <artifactId>load-beans</artifactId>
+ <type>jar</type>
+ </module>
+
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ <useTransitiveDependencies>true</useTransitiveDependencies>
+ </useMavenDependencies>
+ <instance>
+ <plugin-artifact></plugin-artifact>
+ </instance>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Propchange: geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/src/main/history/dependencies.xml?rev=711477&view=auto
==============================================================================
--- geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/src/main/history/dependencies.xml (added)
+++ geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/src/main/history/dependencies.xml Tue Nov 4 16:26:38 2008
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+ <module-id>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>load-beans-plugin</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <type>car</type>
+ </module-id>
+ <dependency>
+ <groupId>org.superbiz</groupId>
+ <artifactId>load-beans</artifactId>
+ <type>jar</type>
+ </dependency>
+</plugin-artifact>
Propchange: geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/src/main/history/dependencies.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/src/main/history/dependencies.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/src/main/history/dependencies.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/src/main/plan/plan.xml?rev=711477&view=auto
==============================================================================
--- geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/src/main/plan/plan.xml (added)
+++ geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/src/main/plan/plan.xml Tue Nov 4 16:26:38 2008
@@ -0,0 +1,21 @@
+<?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">
+</openejb-jar>
Propchange: geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/src/main/plan/plan.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/src/main/plan/plan.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/src/main/plan/plan.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/sandbox/djencks/samples/admin/failover/load-beans/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/samples/admin/failover/load-beans/pom.xml?rev=711477&r1=711476&r2=711477&view=diff
==============================================================================
--- geronimo/sandbox/djencks/samples/admin/failover/load-beans/pom.xml (original)
+++ geronimo/sandbox/djencks/samples/admin/failover/load-beans/pom.xml Tue Nov 4 16:26:38 2008
@@ -20,67 +20,71 @@
<!-- $Rev: 636492 $ $Date: 2008-03-12 13:22:44 -0700 (Wed, 12 Mar 2008) $ -->
<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>
- <groupId>org.superbiz</groupId>
- <artifactId>load-beans</artifactId>
- <packaging>jar</packaging>
- <version>1.0</version>
- <name>OpenEJB :: Load Beans</name>
- <build>
- <defaultGoal>install</defaultGoal>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <repositories>
- <repository>
- <id>apache-m2-snapshot</id>
- <name>Apache Snapshot Repository</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
- </repository>
- </repositories>
- <dependencies>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>javaee-api</artifactId>
- <version>5.0-1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.1</version>
- <scope>test</scope>
- </dependency>
+ <parent>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>failover-nexus-sample</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.superbiz</groupId>
+ <artifactId>load-beans</artifactId>
+ <packaging>jar</packaging>
+ <name>OpenEJB :: Load Beans</name>
+ <build>
+ <defaultGoal>install</defaultGoal>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <repository>
+ <id>apache-m2-snapshot</id>
+ <name>Apache Snapshot Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
+ </repository>
+ </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>5.0-1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.1</version>
+ <scope>test</scope>
+ </dependency>
- <!--
- START SNIPPET: desc
- Nice thing about maven2 is it has test-only dependencies.
- This guarantees that non of your runtime code is dependent
- on any OpenEJB classes.
+ <!--
+ START SNIPPET: desc
+ Nice thing about maven2 is it has test-only dependencies.
+ This guarantees that non of your runtime code is dependent
+ on any OpenEJB classes.
- You need this dep or no clients will be able to connect
- over the ejbd protocol to the embedded ejb container.
+ You need this dep or no clients will be able to connect
+ over the ejbd protocol to the embedded ejb container.
- Notice the other examples use 'openejb-core' and this one
- uses 'openejb-ejbd'. If you wanted to make more protocols
- available, you simply have to add deps to them and they'll
- get picked up in the classpath automatically.
- END SNIPPET: desc
- -->
- <!-- START SNIPPET: openejbdep -->
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-ejbd</artifactId>
- <version>3.0</version>
- <scope>test</scope>
- </dependency>
- <!-- END SNIPPET: openejbdep -->
- </dependencies>
+ Notice the other examples use 'openejb-core' and this one
+ uses 'openejb-ejbd'. If you wanted to make more protocols
+ available, you simply have to add deps to them and they'll
+ get picked up in the classpath automatically.
+ END SNIPPET: desc
+ -->
+ <!-- START SNIPPET: openejbdep -->
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-ejbd</artifactId>
+ <version>3.0</version>
+ <scope>test</scope>
+ </dependency>
+ <!-- END SNIPPET: openejbdep -->
+ </dependencies>
</project>
Modified: geronimo/sandbox/djencks/samples/admin/failover/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/samples/admin/failover/pom.xml?rev=711477&r1=711476&r2=711477&view=diff
==============================================================================
--- geronimo/sandbox/djencks/samples/admin/failover/pom.xml (original)
+++ geronimo/sandbox/djencks/samples/admin/failover/pom.xml Tue Nov 4 16:26:38 2008
@@ -12,9 +12,27 @@
</dependencyManagement>
<modules>
<module>load-beans</module>
+ <module>load-beans-plugin</module>
<module>geronimo-jetty-farm-controller</module>
<module>failover-jetty-demo</module>
- </modules>
+ </modules>
+ <build>
+ <pluginManagement>
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <version>${geronimoVersion}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <category>Samples</category>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </pluginManagement>
+ </build>
<properties>
<geronimoVersion>2.2-SNAPSHOT</geronimoVersion>