From c4fc81a6c8a548cd24db1a1580721fe715708130 Mon Sep 17 00:00:00 2001
From: Martin Traverso <mtraverso@acm.org>
Date: Mon, 6 Dec 2010 22:53:37 -0800
Subject: [PATCH] make sample-server-archetype a real java module

sample server archetype is now a real module that can be compiled and built like any other java module. The archetype gets created and published as part of the build process. This should fix the issue of the platform version in the archetype not being updated by the release plugin.
---
 pom.xml                                       |  2 +-
 sample-server-archetype/pom.xml               | 37 --------
 .../META-INF/maven/archetype-metadata.xml     | 25 ------
 .../resources/archetype-resources/README.txt  |  4 -
 .../src/test/java/TestApp.java                | 29 -------
 sample-server/README.txt                      |  1 +
 .../pom.xml                                   | 85 +++++++++++++++++--
 .../com/proofpoint/sample}/HelloConfig.java   |  5 +-
 .../com/proofpoint/sample}/HelloResource.java |  9 +-
 .../java/com/proofpoint/sample}/Main.java     |  5 +-
 .../com/proofpoint/sample}/MainModule.java    |  9 +-
 11 files changed, 91 insertions(+), 120 deletions(-)
 delete mode 100644 sample-server-archetype/pom.xml
 delete mode 100644 sample-server-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
 delete mode 100644 sample-server-archetype/src/main/resources/archetype-resources/README.txt
 delete mode 100644 sample-server-archetype/src/main/resources/archetype-resources/src/test/java/TestApp.java
 create mode 100644 sample-server/README.txt
 rename {sample-server-archetype/src/main/resources/archetype-resources => sample-server}/pom.xml (67%)
 rename {sample-server-archetype/src/main/resources/archetype-resources/src/main/java => sample-server/src/main/java/com/proofpoint/sample}/HelloConfig.java (61%)
 rename {sample-server-archetype/src/main/resources/archetype-resources/src/main/java => sample-server/src/main/java/com/proofpoint/sample}/HelloResource.java (85%)
 rename {sample-server-archetype/src/main/resources/archetype-resources/src/main/java => sample-server/src/main/java/com/proofpoint/sample}/Main.java (83%)
 rename {sample-server-archetype/src/main/resources/archetype-resources/src/main/java => sample-server/src/main/java/com/proofpoint/sample}/MainModule.java (75%)

diff --git a/pom.xml b/pom.xml
index 95867adf9c..531b3c8c34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -148,12 +148,12 @@
         <module>bootstrap</module>
         <module>formatting</module>
         <module>configuration</module>
-        <module>sample-server-archetype</module>
         <module>zookeeper</module>
         <module>concurrent</module>
         <module>io</module>
         <module>collections</module>
         <module>dbpool</module>
+        <module>sample-server</module>
     </modules>
 </project>
 
diff --git a/sample-server-archetype/pom.xml b/sample-server-archetype/pom.xml
deleted file mode 100644
index ffe47d3541..0000000000
--- a/sample-server-archetype/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <groupId>com.proofpoint.platform</groupId>
-    <artifactId>sample-server-archetype</artifactId>
-    <version>0.18-SNAPSHOT</version>
-    <packaging>maven-archetype</packaging>
-    <name>sample-server-archetype</name>
-
-    <parent>
-        <groupId>com.proofpoint.platform</groupId>
-        <artifactId>platform</artifactId>
-        <version>0.18-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <build>
-        <extensions>
-            <extension>
-                <groupId>org.apache.maven.archetype</groupId>
-                <artifactId>archetype-packaging</artifactId>
-                <version>2.0-alpha-5</version>
-            </extension>
-        </extensions>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-archetype-plugin</artifactId>
-                    <version>2.0-alpha-5</version>
-                    <extensions>true</extensions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-</project>
diff --git a/sample-server-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/sample-server-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
deleted file mode 100644
index 470bc79e9f..0000000000
--- a/sample-server-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="sample-server"
-    xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <fileSets>
-    <fileSet packaged="true "filtered="true" encoding="UTF-8">
-      <directory>src/main/java</directory>
-      <includes>
-        <include>**/*.java</include>
-      </includes>
-    </fileSet>
-    <fileSet packaged="true" filtered="true" encoding="UTF-8">
-      <directory>src/test/java</directory>
-      <includes>
-        <include>**/*.java</include>
-      </includes>
-    </fileSet>
-    <fileSet filtered="true" encoding="UTF-8">
-      <directory></directory>
-      <includes>
-        <include>README.txt</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</archetype-descriptor>
diff --git a/sample-server-archetype/src/main/resources/archetype-resources/README.txt b/sample-server-archetype/src/main/resources/archetype-resources/README.txt
deleted file mode 100644
index 0deb4ba002..0000000000
--- a/sample-server-archetype/src/main/resources/archetype-resources/README.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-I'm empty...
\ No newline at end of file
diff --git a/sample-server-archetype/src/main/resources/archetype-resources/src/test/java/TestApp.java b/sample-server-archetype/src/main/resources/archetype-resources/src/test/java/TestApp.java
deleted file mode 100644
index f75c410a8d..0000000000
--- a/sample-server-archetype/src/main/resources/archetype-resources/src/test/java/TestApp.java
+++ /dev/null
@@ -1,29 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-package ${package};         
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
-
-import static org.testng.Assert.*;
-
-public class TestApp
-{
-    @BeforeMethod
-    public void setup()
-    {
-
-    }
-
-    @AfterMethod
-    public void teardown()
-    {
-
-    }
-
-    @Test
-    public void test()
-    {
-    }
-}
diff --git a/sample-server/README.txt b/sample-server/README.txt
new file mode 100644
index 0000000000..aa76484c79
--- /dev/null
+++ b/sample-server/README.txt
@@ -0,0 +1 @@
+Sample server that demonstrates usage of the platform codebase.
\ No newline at end of file
diff --git a/sample-server-archetype/src/main/resources/archetype-resources/pom.xml b/sample-server/pom.xml
similarity index 67%
rename from sample-server-archetype/src/main/resources/archetype-resources/pom.xml
rename to sample-server/pom.xml
index aa328c657f..eed3ff379e 100644
--- a/sample-server-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/sample-server/pom.xml
@@ -2,18 +2,24 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>${groupId}</groupId>
-    <artifactId>${artifactId}</artifactId>
-    <version>${version}</version>
+    <groupId>com.proofpoint.platform</groupId>
+    <artifactId>sample-server</artifactId>
+    <version>0.18-SNAPSHOT</version>
     <name>sample-server</name>
 
     <properties>
-        <main-class>Main</main-class>
+        <main-class>com.proofpoint.sample.Main</main-class>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <platform-version>0.15-SNAPSHOT</platform-version>
+        <platform-version>0.18-SNAPSHOT</platform-version>
     </properties>
-    
+
     <dependencies>
+        <dependency>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <version>2.0</version>
+        </dependency>
+
         <dependency>
             <groupId>com.proofpoint.platform</groupId>
             <artifactId>bootstrap</artifactId>
@@ -59,7 +65,7 @@
             <type>tar.gz</type>
         </dependency>
 
-        
+
         <!-- for testing -->
         <dependency>
             <groupId>org.testng</groupId>
@@ -95,6 +101,71 @@
                 </executions>
             </plugin>
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-archetype-plugin</artifactId>
+                <version>2.0</version>
+                <executions>
+                    <execution>
+                        <id>create-archetype</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>create-from-project</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <artifactId>maven-invoker-plugin</artifactId>
+                <version>1.5</version>
+                <configuration>
+                    <debug>true</debug>
+                    <pomIncludes>
+                        <pomInclude>archetype/pom.xml</pomInclude>
+                    </pomIncludes>
+                    <projectsDirectory>${project.build.directory}/generated-sources</projectsDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>package-archetype</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <goals>
+                                <goal>package</goal>
+                            </goals>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>install-archetype</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <goals>
+                                <goal>install</goal>
+                            </goals>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>deploy-archetype</id>
+                        <phase>deploy</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <goals>
+                                <goal>deploy</goal>
+                            </goals>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/sample-server-archetype/src/main/resources/archetype-resources/src/main/java/HelloConfig.java b/sample-server/src/main/java/com/proofpoint/sample/HelloConfig.java
similarity index 61%
rename from sample-server-archetype/src/main/resources/archetype-resources/src/main/java/HelloConfig.java
rename to sample-server/src/main/java/com/proofpoint/sample/HelloConfig.java
index 29a29e7c0d..a193e1214f 100644
--- a/sample-server-archetype/src/main/resources/archetype-resources/src/main/java/HelloConfig.java
+++ b/sample-server/src/main/java/com/proofpoint/sample/HelloConfig.java
@@ -1,7 +1,4 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-package ${package};
+package com.proofpoint.sample;
 
 import com.proofpoint.configuration.Config;
 
diff --git a/sample-server-archetype/src/main/resources/archetype-resources/src/main/java/HelloResource.java b/sample-server/src/main/java/com/proofpoint/sample/HelloResource.java
similarity index 85%
rename from sample-server-archetype/src/main/resources/archetype-resources/src/main/java/HelloResource.java
rename to sample-server/src/main/java/com/proofpoint/sample/HelloResource.java
index f66e5a5755..4eafe8b113 100644
--- a/sample-server-archetype/src/main/resources/archetype-resources/src/main/java/HelloResource.java
+++ b/sample-server/src/main/java/com/proofpoint/sample/HelloResource.java
@@ -1,8 +1,7 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-package ${package};
-       
+package com.proofpoint.sample;
+
+import com.proofpoint.sample.HelloConfig;
+
 import com.google.inject.Inject;
 
 import javax.ws.rs.GET;
diff --git a/sample-server-archetype/src/main/resources/archetype-resources/src/main/java/Main.java b/sample-server/src/main/java/com/proofpoint/sample/Main.java
similarity index 83%
rename from sample-server-archetype/src/main/resources/archetype-resources/src/main/java/Main.java
rename to sample-server/src/main/java/com/proofpoint/sample/Main.java
index eb9fa0b2b9..1f861563ee 100644
--- a/sample-server-archetype/src/main/resources/archetype-resources/src/main/java/Main.java
+++ b/sample-server/src/main/java/com/proofpoint/sample/Main.java
@@ -1,7 +1,4 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-package ${package};
+package com.proofpoint.sample;
 
 import com.google.inject.Injector;
 import com.proofpoint.bootstrap.Bootstrap;
diff --git a/sample-server-archetype/src/main/resources/archetype-resources/src/main/java/MainModule.java b/sample-server/src/main/java/com/proofpoint/sample/MainModule.java
similarity index 75%
rename from sample-server-archetype/src/main/resources/archetype-resources/src/main/java/MainModule.java
rename to sample-server/src/main/java/com/proofpoint/sample/MainModule.java
index f8b2108180..0613319a7f 100644
--- a/sample-server-archetype/src/main/resources/archetype-resources/src/main/java/MainModule.java
+++ b/sample-server/src/main/java/com/proofpoint/sample/MainModule.java
@@ -1,11 +1,12 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-package ${package};        
+package com.proofpoint.sample;
+
+import com.proofpoint.sample.HelloConfig;
 
 import com.google.inject.Binder;
 import com.google.inject.Module;
+import com.google.inject.Scopes;
 import com.proofpoint.configuration.ConfigurationModule;
+import com.proofpoint.sample.HelloResource;
 import org.codehaus.jackson.jaxrs.JacksonJsonProvider;
 
 public class MainModule