Updating maven snapshot generator

branflake2267 · Feb 6, 2015 · 26fba2b · 26fba2b
1 parent 24afda5
commit 26fba2b
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 61 deletions.
diff --git a/...-rpc-appengine-guice/src/main/java/org/gonevertical/project/client/ProjectEntryPoint.java b/...-rpc-appengine-guice/src/main/java/org/gonevertical/project/client/ProjectEntryPoint.java
@@ -21,9 +21,9 @@ public class ProjectEntryPoint implements EntryPoint {
 
   @Override
   public void onModuleLoad() {
-    RootPanel.get().add(new HTML("GWT App has loaded.<br/>"));
+    RootPanel.get().add(new HTML("GWT App has loaded...<br/>"));
 
-    rpcService.testCallServer("Hello...", new AsyncCallback<String>() {
+    rpcService.testCallServer("Hello ...", new AsyncCallback<String>() {
       @Override
       public void onSuccess(String result) {
         RootPanel.get().add(new HTML(result));

diff --git a/archetypes/gwt-basic-rpc-appengine-guice/src/main/webapp/WEB-INF/web.xml b/archetypes/gwt-basic-rpc-appengine-guice/src/main/webapp/WEB-INF/web.xml
@@ -5,6 +5,10 @@
     version="2.5">
     <display-name>gwt-basic-rpc-appengine-guice</display-name>
 
+    <welcome-file-list>
+        <welcome-file>Project.html</welcome-file>
+    </welcome-file-list>
+
     <!-- Servlet disptach intercepter -->
     <listener>
         <listener-class>org.gonevertical.project.server.guice.GuiceServletConfig</listener-class>

diff --git a/archetypes/gwt-gpe-test-gwt27/pom.xml b/archetypes/gwt-gpe-test-gwt27/pom.xml
@@ -12,11 +12,11 @@
 
     <properties>
         <!-- GWT -->
-        <gwt.version>2.7.0-rc1</gwt.version>
+        <gwt.version>2.7.0</gwt.version>
         <gwt.style>OBF</gwt.style>
 
         <!-- Maven -->
-        <gwt.plugin.version>2.7.0-beta1</gwt.plugin.version>
+        <gwt.plugin.version>2.7.0</gwt.plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <webappDirectory>${project.build.directory}/${project.build.finalName}</webappDirectory>
     </properties>

diff --git a/generated/pom.xml b/generated/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.github.branflake2267.archetypes</groupId>
 		<artifactId>archetypes-parent</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 
 	<packaging>pom</packaging>

diff --git a/generator/pom.xml b/generator/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.github.branflake2267.archetypes</groupId>
     <artifactId>archetypes-parent</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>archetype-generator</artifactId>

diff --git a/generator/src/main/java/org/gonevertical/archetypes/RunArchetypesGenerator.java b/generator/src/main/java/org/gonevertical/archetypes/RunArchetypesGenerator.java
@@ -14,7 +14,7 @@ public static void main(String[] args) {
   private void run() {
     List<String> projects = new ArrayList<String>();
     // projects.add("gwt-basic");
-    // projects.add("gwt-basic-snapshot");
+    // projects.add("gwt-basic-snapshot"); 
     // projects.add("gwt-basic-beta");
 
     // projects.add("gwt-basic-rpc");

diff --git a/generator/src/main/java/org/gonevertical/archetypes/generator/GwtArchetypeGenerator.java b/generator/src/main/java/org/gonevertical/archetypes/generator/GwtArchetypeGenerator.java
@@ -305,7 +305,7 @@ private void findAndReplaceInFiletupesCustom() {
     }
   }
 
-  protected void findAndReplaceInFileTypes() {
+  protected void findAndReplaceInFileTypes() { 
     regexFindAndReplaceFiles(".xml", "<module>.*\\.(.*)</module>", "<module>\\${package}.$1</module>");
 
     // Only do cap Project in .xml files

diff --git a/pom.xml b/pom.xml
@@ -1,65 +1,66 @@
 <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>
+  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>
 
-    <parent>
-        <groupId>org.sonatype.oss</groupId>
-        <artifactId>oss-parent</artifactId>
-        <version>8</version>
-    </parent>
+  <parent>
+    <groupId>org.sonatype.oss</groupId>
+    <artifactId>oss-parent</artifactId>
+    <version>9</version>
+  </parent>
 
-    <groupId>com.github.branflake2267.archetypes</groupId>
-    <artifactId>archetypes-parent</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>Archetypes Parent</name>
+  <groupId>com.github.branflake2267.archetypes</groupId>
+  <artifactId>archetypes-parent</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <name>Archetypes Parent</name>
 
-    <url>https://github.com/branflake2267/Archetypes</url>
-    <inceptionYear>2013</inceptionYear>
+  <url>https://github.com/branflake2267/Archetypes</url>
+  <inceptionYear>2013</inceptionYear>
 
-    <organization>
-        <name>Archetypes</name>
-        <url>https://github.com/branflake2267/Archetypes.git</url>
-    </organization>
+  <organization>
+    <name>Archetypes</name>
+    <url>https://github.com/branflake2267/Archetypes.git</url>
+  </organization>
 
-    <licenses>
-        <license>
-            <name>Apache License 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-        </license>
-    </licenses>
+  <licenses>
+    <license>
+      <name>Apache License 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+    </license>
+  </licenses>
 
-    <issueManagement>
-        <system>github</system>
-        <url>https://github.com/branflake2267/Archetypes/issues</url>
-    </issueManagement>
+  <issueManagement>
+    <system>github</system>
+    <url>https://github.com/branflake2267/Archetypes/issues</url>
+  </issueManagement>
 
-    <scm>
-        <connection>scm:git:git://github.com/branflake2267/Archetypes.git/</connection>
-        <developerConnection>scm:git:git@github.com:branflake2267/Archetypes.git</developerConnection>
-        <url>https://github.com/branflake2267/Archetypes.git</url>
-    </scm>
+  <scm>
+    <connection>scm:git:git://github.com/branflake2267/Archetypes.git/</connection>
+    <developerConnection>scm:git:git@github.com:branflake2267/Archetypes.git</developerConnection>
+    <url>https://github.com/branflake2267/Archetypes.git</url>
+  </scm>
 
-    <developers>
-        <developer>
-            <id>branflake2267</id>
-            <name>Brandon Donnelson</name>
-            <email>branflake2267@gmail.com</email>
-            <organization>Gone Vertical LLC</organization>
-            <organizationUrl>http://gonevertical.com</organizationUrl>
-            <roles>
-                <role>Lead Developer</role>
-            </roles>
-            <timezone>-8</timezone>
-        </developer>
-    </developers>
+  <developers>
+    <developer>
+      <id>branflake2267</id>
+      <name>Brandon Donnelson</name>
+      <email>branflake2267@gmail.com</email>
+      <organization>Gone Vertical LLC</organization>
+      <organizationUrl>http://gonevertical.com</organizationUrl>
+      <roles>
+        <role>Lead Developer</role>
+      </roles>
+      <timezone>-8</timezone>
+    </developer>
+  </developers>
 
-    <ciManagement>
-        <system>Team City</system>
-        <url>http://teamcity.gonevertical.org/project.html?projectId=project9</url>
-    </ciManagement>
+  <ciManagement>
+    <system>Team City</system>
+    <url>http://teamcity.gonevertical.org/project.html?projectId=project9</url>
+  </ciManagement>
 
-    <modules>
-        <module>generated</module>
-    </modules>
+  <modules>
+    <module>generator</module>
+    <!-- <module>generated</module> -->
+  </modules>
 </project>