geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r711634 - in /geronimo/sandbox/djencks/samples/admin/failover: ./ controller-as-repo/ failover-jetty-demo/ failover-jetty-demo/src/main/assembly/ failover-jetty-demo/src/main/resources/ failover-jetty-demo/src/main/resources/grinder-3.0.1/ ...
Date Wed, 05 Nov 2008 17:33:46 GMT
Author: djencks
Date: Wed Nov  5 09:33:42 2008
New Revision: 711634

URL: http://svn.apache.org/viewvc?rev=711634&view=rev
Log:
set up nexus as repo, make it work

Added:
    geronimo/sandbox/djencks/samples/admin/failover/nexus-as-repo/
      - copied from r711469, geronimo/sandbox/djencks/samples/admin/failover/controller-as-repo/
Removed:
    geronimo/sandbox/djencks/samples/admin/failover/controller-as-repo/
Modified:
    geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/pom.xml
    geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/assembly/assembly.xml
    geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/resources/all.sh
    geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/resources/deploy.gsh
    geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/resources/grinder-3.0.1/grinder.properties
    geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/resources/hostname
    geronimo/sandbox/djencks/samples/admin/failover/geronimo-jetty-farm-controller/pom.xml
    geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/pom.xml
    geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/samples/admin/failover/nexus-as-repo/pom.xml
    geronimo/sandbox/djencks/samples/admin/failover/pom.xml

Modified: geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/pom.xml?rev=711634&r1=711633&r2=711634&view=diff
==============================================================================
--- geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/pom.xml (original)
+++ geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/pom.xml Wed Nov  5
09:33:42 2008
@@ -30,7 +30,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>failover-jetty-demo</artifactId>
     <version>2.2-SNAPSHOT</version>
-    <packaging>pom</packaging> 
+    <packaging>pom</packaging>
 
     <name>Geronimo Demos :: Failover on Jetty</name>
 
@@ -39,27 +39,27 @@
     </description>
 
     <dependencies>
-     
+
         <dependency>
             <groupId>org.apache.geronimo.assemblies</groupId>
             <artifactId>geronimo-plugin-farm-node</artifactId>
-            <version>${geronimo.version}</version>
+            <version>${geronimoVersion}</version>
             <classifier>bin</classifier>
             <type>tar.gz</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.assemblies</groupId>
+            <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>geronimo-jetty-farm-controller</artifactId>
-            <version>${geronimo.version}</version>
+            <version>${version}</version>
             <classifier>bin</classifier>
             <type>tar.gz</type>
         </dependency>
 
         <dependency>
-            <groupId>org.superbiz</groupId> 
+            <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>load-beans</artifactId>
-            <version>1.0</version>
+            <version>${version}</version>
         </dependency>
     </dependencies>
 
@@ -68,12 +68,12 @@
             <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>
+                <configuration>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <descriptors>
+                        <descriptor>${project.basedir}/src/main/assembly/assembly.xml</descriptor>
+                    </descriptors>
+                </configuration>
                 <executions>
                     <execution>
                         <id>package</id>
@@ -94,8 +94,5 @@
             </plugin>
         </plugins>
     </build>
-    <properties>
-        <geronimo.version>2.2-SNAPSHOT</geronimo.version>
-    </properties>
 
 </project>

Modified: geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/assembly/assembly.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/assembly/assembly.xml?rev=711634&r1=711633&r2=711634&view=diff
==============================================================================
--- geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/assembly/assembly.xml
(original)
+++ geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/assembly/assembly.xml
Wed Nov  5 09:33:42 2008
@@ -54,8 +54,8 @@
             <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>
+                <include>org.apache.geronimo.samples:geronimo-jetty-farm-controller</include>
+                <include>org.apache.geronimo.samples:load-beans</include>
             </includes>
         </dependencySet>
         

Modified: geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/resources/all.sh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/resources/all.sh?rev=711634&r1=711633&r2=711634&view=diff
==============================================================================
--- geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/resources/all.sh
(original)
+++ geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/resources/all.sh
Wed Nov  5 09:33:42 2008
@@ -1,12 +1,12 @@
 #!/bin/bash
 
 echo unpack controller server
-tar xzf geronimo-tomcat-farm-controller-2.2-SNAPSHOT-bin.tar.gz
+tar xzf geronimo-jetty-farm-controller-2.2-SNAPSHOT-bin.tar.gz
 
 host=$(cat hostname)
 
 echo start controller server in background
-./geronimo-tomcat-farm-controller-2.2-SNAPSHOT/bin/gsh geronimo/start-server -G config.substitution.ServerHostname=$host
>controller.log &
+./geronimo-jetty-farm-controller-2.2-SNAPSHOT/bin/gsh geronimo/start-server -G config.substitution.ServerHostname=$host
>controller.log &
 
 echo wait 20 seconds for controller to start
 sleep 20
@@ -19,7 +19,7 @@
 sleep 20
 
 echo deploy the app, distribute it to the farm
-./geronimo-tomcat-farm-controller-2.2-SNAPSHOT/bin/gsh<deploy.gsh
+./geronimo-jetty-farm-controller-2.2-SNAPSHOT/bin/gsh<deploy.gsh
 
 # gshell (jline) seems to leave the terminal in a strage state
 # so reset it

Modified: geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/resources/deploy.gsh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/resources/deploy.gsh?rev=711634&r1=711633&r2=711634&view=diff
==============================================================================
--- geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/resources/deploy.gsh
(original)
+++ geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/resources/deploy.gsh
Wed Nov  5 09:33:42 2008
@@ -1,3 +1,3 @@
 #gshell script
-deploy/distribute load-beans-1.0.jar --username system --password manager
-cluster/deploy add -c cluster1 -l pluginList1 -a  org.superbiz/load-beans/1.0/car 
+#deploy/distribute load-beans-1.0.jar --username system --password manager
+cluster/deploy add -c cluster1 -l pluginList1 -a  org.apache.geronimo.samples/load-beans-plugin/2.2-SNAPSHOT/car
 --username system --password manager

Modified: geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/resources/grinder-3.0.1/grinder.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/resources/grinder-3.0.1/grinder.properties?rev=711634&r1=711633&r2=711634&view=diff
==============================================================================
--- geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/resources/grinder-3.0.1/grinder.properties
(original)
+++ geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/resources/grinder-3.0.1/grinder.properties
Wed Nov  5 09:33:42 2008
@@ -40,10 +40,10 @@
 # Use to adjust the classpath used for the worker process JVMs. Anything
 # specified here will be prepended to the classpath used to start the Grinder
 # processes.
-grinder.jvm.classpath=../geronimo-tomcat-farm-controller-2.2-SNAPSHOT/repository/org/apache/openejb/openejb-client/3.1-SNAPSHOT/openejb-client-3.1-SNAPSHOT.jar:\
-  ../geronimo-tomcat-farm-controller-2.2-SNAPSHOT/repository/org/apache/geronimo/specs/geronimo-ejb_3.0_spec/1.0.1/geronimo-ejb_3.0_spec-1.0.1.jar:\
-  ../geronimo-tomcat-farm-controller-2.2-SNAPSHOT/repository/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1.jar:\
-  ../load-beans-1.0.jar
+grinder.jvm.classpath=/Users/david/.m2/repository/org/apache/openejb/openejb-client/3.1-SNAPSHOT/openejb-client-3.1-SNAPSHOT.jar:\
+/Users/david/.m2/repository/org/apache/geronimo/specs/geronimo-ejb_3.0_spec/1.0.1/geronimo-ejb_3.0_spec-1.0.1.jar:\
+/Users/david/.m2/repository/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1.jar:\
+/Users/david/.m2/repository/org/apache/geronimo/samples/load-beans/2.2-SNAPSHOT/load-beans-2.2-SNAPSHOT.jar
 
 # Additional arguments to worker process JVMs.
 #grinder.jvm.arguments = -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005

Modified: geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/resources/hostname
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/resources/hostname?rev=711634&r1=711633&r2=711634&view=diff
==============================================================================
--- geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/resources/hostname
(original)
+++ geronimo/sandbox/djencks/samples/admin/failover/failover-jetty-demo/src/main/resources/hostname
Wed Nov  5 09:33:42 2008
@@ -1 +1 @@
-192.168.15.111
\ No newline at end of file
+localhost
\ No newline at end of file

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=711634&r1=711633&r2=711634&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
Wed Nov  5 09:33:42 2008
@@ -52,6 +52,12 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.samples</groupId>
+            <artifactId>nexus-as-repo</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
@@ -60,7 +66,7 @@
             <type>car</type>
         </dependency>
 
-<!--
+        <!--
         <dependency>
             <groupId>org.apache.geronimo.plugingroups</groupId>
             <artifactId>web-jetty</artifactId>
@@ -103,15 +109,15 @@
             <type>car</type>
         </dependency>
         -->
-<!--
-        <dependency>
-            <groupId>org.apache.geronimo.plugingroups</groupId>
-            <artifactId>clustering</artifactId>
-            <version>${version}</version>
-            <type>jar</type>
-        </dependency>
--->
-<!-- stuff not from above plugingroups, yet in jetty-javaee5 assembly -->
+        <!--
+                <dependency>
+                    <groupId>org.apache.geronimo.plugingroups</groupId>
+                    <artifactId>clustering</artifactId>
+                    <version>${version}</version>
+                    <type>jar</type>
+                </dependency>
+        -->
+        <!-- stuff not from above plugingroups, yet in jetty-javaee5 assembly -->
         <!--
     <dependency>
         <groupId>org.apache.geronimo.plugins</groupId>

Modified: 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=711634&r1=711633&r2=711634&view=diff
==============================================================================
--- geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/pom.xml (original)
+++ geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/pom.xml Wed Nov  5 09:33:42
2008
@@ -34,7 +34,14 @@
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>load-beans</artifactId>
             <type>jar</type>
-            <version>2.2-SNAPSHOT</version>
+            <version>${version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</artifactId>
+            <type>car</type>
+            <version>${geronimoVersion}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>

Modified: 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=711634&r1=711633&r2=711634&view=diff
==============================================================================
--- geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/src/main/history/dependencies.xml
(original)
+++ geronimo/sandbox/djencks/samples/admin/failover/load-beans-plugin/src/main/history/dependencies.xml
Wed Nov  5 09:33:42 2008
@@ -7,8 +7,8 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>org.apache.geronimo.samples</groupId>
-        <artifactId>load-beans</artifactId>
-        <type>jar</type>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>openejb</artifactId>
+        <type>car</type>
     </dependency>
 </plugin-artifact>

Modified: geronimo/sandbox/djencks/samples/admin/failover/nexus-as-repo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/samples/admin/failover/nexus-as-repo/pom.xml?rev=711634&r1=711469&r2=711634&view=diff
==============================================================================
--- geronimo/sandbox/djencks/samples/admin/failover/nexus-as-repo/pom.xml (original)
+++ geronimo/sandbox/djencks/samples/admin/failover/nexus-as-repo/pom.xml Wed Nov  5 09:33:42
2008
@@ -1,25 +1,15 @@
 <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>
-    <groupId>org.apache.geronimo.configs</groupId>
-    <artifactId>controller-as-repo</artifactId>
+    <artifactId>nexus-as-repo</artifactId>
     <version>2.2-SNAPSHOT</version>
     <packaging>car</packaging>
 
-    <properties>
-        <!-- This property is required by the car:package mojo -->
-        <geronimoVersion>2.2-SNAPSHOT</geronimoVersion>
-
-    </properties>
-
-
-    <dependencies>
-        <!-- if you are deploying a jee application, use scope provided -->
-        <!-- other dependencies will normally end up as dependencies in the plan and geronimo-plugin.xml
-->
-        <!-- include dependencies on all deployer modules needed, with scope provided
-->
-
-    </dependencies>
-
     <build>
         <pluginManagement>
             <plugins>
@@ -44,7 +34,7 @@
                 <configuration>
                     <instance>
                         <plugin-artifact>
-                            <config-substitution key="DefaultPluginRepository">http://localhost:8080/plugin/maven-repo</config-substitution>
+                            <config-substitution key="DefaultPluginRepository">http://localhost:8081/nexus/content/groups/public/</config-substitution>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/sandbox/djencks/samples/admin/failover/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/samples/admin/failover/pom.xml?rev=711634&r1=711633&r2=711634&view=diff
==============================================================================
--- geronimo/sandbox/djencks/samples/admin/failover/pom.xml (original)
+++ geronimo/sandbox/djencks/samples/admin/failover/pom.xml Wed Nov  5 09:33:42 2008
@@ -13,6 +13,7 @@
     <modules>
         <module>load-beans</module>
         <module>load-beans-plugin</module>
+        <module>nexus-as-repo</module>
         <module>geronimo-jetty-farm-controller</module>
         <module>failover-jetty-demo</module>
     </modules>
@@ -57,6 +58,7 @@
             <id>nexus.snapshots</id>
             <name>Internal Snapshots</name>
             <url>http://localhost:8081/nexus/content/repositories/snapshots</url>
+            <uniqueVersion>false</uniqueVersion>
         </snapshotRepository>
         <repository>
             <id>nexus.releases</id>



Mime
View raw message