Merge pull request #352 from freddyboucher/move-examples-modules

Move examples modules out of core 'restygwt' module.

.travis.yml

@@ -15,11 +15,11 @@ script: mvn install -Dgwt.version=$GWT_VERSION
 matrix:
   include:
     - jdk: openjdk7
-      script: cd restygwt; mvn verify -Prun-its -Dmaven.test.skip -Dinvoker.test=restygwt-overlay-example
+      script: cd restygwt-examples; mvn verify -Prun-examples -Dmaven.test.skip -pl restygwt-overlay-example -s settings.xml
     - jdk: oraclejdk8
-      script: cd restygwt; mvn verify -Prun-its -Dmaven.test.skip -Dinvoker.test=restygwt-example
+      script: cd restygwt-examples; mvn verify -Prun-examples -Dmaven.test.skip -pl restygwt-example -s settings.xml
     - jdk: oraclejdk8
-      script: cd restygwt; mvn verify -Prun-its -Dmaven.test.skip -Dinvoker.test=restygwt-direct-example
+      script: cd restygwt-examples; mvn verify -Prun-examples -Dmaven.test.skip -pl restygwt-direct-example -s settings.xml
     - jdk: oraclejdk8
-      script: cd restygwt; mvn verify -Prun-its -Dmaven.test.skip -Dinvoker.test=restygwt-jersey-*,restygwt-cxf-jaxson-*
+      script: cd restygwt-examples; mvn verify -Prun-examples -Dmaven.test.skip -pl restygwt-jersey-jaxb-example,restygwt-jersey-jaxson-example,restygwt-cxf-jaxson-example -s settings.xml
 

pom.xml

@@ -336,7 +336,12 @@
                 </plugins>
             </build>
         </profile>
-
+        <profile>
+            <id>run-examples</id>
+            <modules>
+                <module>restygwt-examples</module>
+            </modules>
+        </profile>
     </profiles>
 
     <modules>

restygwt/src/it/pom.xml → restygwt-examples/pom.xml

@@ -23,16 +23,20 @@
          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.fusesource.restygwt</groupId>
+        <artifactId>restygwt-project</artifactId>
+        <version>2.2.3-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
     <groupId>org.fusesource.restygwt</groupId>
-    <artifactId>restygwt-it-parent</artifactId>
-    <version>@project.version@</version>
+    <artifactId>restygwt-examples</artifactId>
+    <version>2.2.3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>RestyGWT Parent for ITs</name>
+    <name>RestyGWT examples</name>
 
-    <description>
-        RestyGWT Parent POM for integration tests
-    </description>
     <!--
       <pluginRepositories>
         <pluginRepository>
@@ -61,9 +65,6 @@
         </repository>
       </repositories>
     -->
-    <properties>
-        <gwt-version>@gwt-version@</gwt-version>
-    </properties>
 
     <dependencies>
 
@@ -82,7 +83,7 @@
         <dependency>
             <groupId>org.fusesource.restygwt</groupId>
             <artifactId>restygwt</artifactId>
-            <version>@project.version@</version>
+            <version>2.2.3-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -143,4 +144,14 @@
         </plugins>
     </build>
 
+    <modules>
+        <module>restygwt-cxf-jaxson-example</module>
+        <module>restygwt-direct-example</module>
+        <module>restygwt-example</module>
+        <module>restygwt-jersey-jaxb-example</module>
+        <module>restygwt-jersey-jaxson-example</module>
+        <module>restygwt-overlay-example</module>
+        <module>restygwt-rails-example</module>
+    </modules>
+
 </project>

restygwt/src/it/restygwt-cxf-jaxson-example/pom.xml → restygwt-examples/restygwt-cxf-jaxson-example/pom.xml

@@ -25,11 +25,11 @@
 
     <parent>
         <groupId>org.fusesource.restygwt</groupId>
-        <artifactId>restygwt-it-parent</artifactId>
-        <version>@project.version@</version>
+        <artifactId>restygwt-examples</artifactId>
+        <version>2.2.3-SNAPSHOT</version>
     </parent>
     <artifactId>restygwt-cxf-jaxson-example</artifactId>
-    <version>@project.version@</version>
+    <version>2.2.3-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <name>RestyGWT CXF JAXB Example</name>

restygwt/src/it/restygwt-cxf-jaxson-example/src/test/java/org/fusesource/restygwt/examples/client/CxfJaxsonGWTTestSuite.java → restygwt-examples/restygwt-cxf-jaxson-example/src/test/java/org/fusesource/restygwt/examples/client/CxfJaxsonGWTTestSuite.java

@@ -1,36 +1,36 @@
-/**
- * Copyright (C) 2009-2012 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
- *
- * Licensed 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.
- */
-
-package org.fusesource.restygwt.examples.client;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import com.google.gwt.junit.tools.GWTTestSuite;
-
-/**
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class CxfJaxsonGWTTestSuite extends GWTTestSuite {
-    public static Test suite() {
-        TestSuite suite = new TestSuite("GWT Tests for RestyGWT");
-        suite.addTestSuite(CxfJaxsonTestGWT.class);
-        return suite;
-    }
-}
+/**
+ * Copyright (C) 2009-2012 the original author or authors.
+ * See the notice.md file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Licensed 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.
+ */
+
+package org.fusesource.restygwt.examples.client;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import com.google.gwt.junit.tools.GWTTestSuite;
+
+/**
+ *
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
+public class CxfJaxsonGWTTestSuite extends GWTTestSuite {
+    public static Test suite() {
+        TestSuite suite = new TestSuite("GWT Tests for RestyGWT");
+        suite.addTestSuite(CxfJaxsonTestGWT.class);
+        return suite;
+    }
+}

restygwt/src/it/restygwt-direct-example/pom.xml → restygwt-examples/restygwt-direct-example/pom.xml

@@ -25,11 +25,11 @@
 
     <parent>
         <groupId>org.fusesource.restygwt</groupId>
-        <artifactId>restygwt-it-parent</artifactId>
-        <version>@project.version@</version>
+        <artifactId>restygwt-examples</artifactId>
+        <version>2.2.3-SNAPSHOT</version>
     </parent>
     <artifactId>restygwt-direct-example</artifactId>
-    <version>@project.version@</version>
+    <version>2.2.3-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <name>RestyGWT Direct Example</name>

restygwt/src/it/restygwt-example/pom.xml → restygwt-examples/restygwt-example/pom.xml

@@ -25,11 +25,11 @@
 
     <parent>
         <groupId>org.fusesource.restygwt</groupId>
-        <artifactId>restygwt-it-parent</artifactId>
-        <version>@project.version@</version>
+        <artifactId>restygwt-examples</artifactId>
+        <version>2.2.3-SNAPSHOT</version>
     </parent>
     <artifactId>restygwt-example</artifactId>
-    <version>@project.version@</version>
+    <version>2.2.3-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <name>RestyGWT Example</name>

restygwt/src/it/restygwt-example/src/main/java/org/fusesource/restygwt/examples/client/CheesyCrust.java → restygwt-examples/restygwt-example/src/main/java/org/fusesource/restygwt/examples/client/CheesyCrust.java

@@ -1,8 +1,8 @@
-package org.fusesource.restygwt.examples.client;
-
-
-public class CheesyCrust implements Crust {
-    public String getName() {
-        return "cheesy";
-    }
-}
+package org.fusesource.restygwt.examples.client;
+
+
+public class CheesyCrust implements Crust {
+    public String getName() {
+        return "cheesy";
+    }
+}

restygwt/src/it/restygwt-example/src/main/java/org/fusesource/restygwt/examples/client/Crust.java → restygwt-examples/restygwt-example/src/main/java/org/fusesource/restygwt/examples/client/Crust.java

@@ -1,10 +1,10 @@
-package org.fusesource.restygwt.examples.client;
-
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
-import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
-
-@JsonTypeInfo(use = Id.CLASS, include = As.PROPERTY, property = "class")
-public interface Crust {
-    String getName();
-}
+package org.fusesource.restygwt.examples.client;
+
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
+import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
+
+@JsonTypeInfo(use = Id.CLASS, include = As.PROPERTY, property = "class")
+public interface Crust {
+    String getName();
+}

restygwt/src/it/restygwt-example/src/main/java/org/fusesource/restygwt/examples/client/ThinCrust.java → restygwt-examples/restygwt-example/src/main/java/org/fusesource/restygwt/examples/client/ThinCrust.java

@@ -1,9 +1,9 @@
-package org.fusesource.restygwt.examples.client;
-
-public class ThinCrust implements Crust {
-
-    public String getName() {
-        return "thin";
-    }
-
-}
+package org.fusesource.restygwt.examples.client;
+
+public class ThinCrust implements Crust {
+
+    public String getName() {
+        return "thin";
+    }
+
+}

restygwt/src/it/restygwt-example/src/test/java/org/fusesource/restygwt/examples/client/RestyGWTTestSuite.java → restygwt-examples/restygwt-example/src/test/java/org/fusesource/restygwt/examples/client/RestyGWTTestSuite.java

@@ -1,40 +1,40 @@
-/**
- * Copyright (C) 2009-2012 the original author or authors.
- * See the notice.md file distributed with this work for additional
- * information regarding copyright ownership.
- *
- * Licensed 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.
- */
-
-package org.fusesource.restygwt.examples.client;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import com.google.gwt.junit.tools.GWTTestSuite;
-
-/**
- *
- * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
- */
-public class RestyGWTTestSuite extends GWTTestSuite {
-    public static Test suite() {
-        TestSuite suite = new TestSuite("GWT Tests for RestyGWT");
-        suite.addTestSuite(PizzaServiceUITestGWT.class);
-        suite.addTestSuite(ResourceUITestGWT.class);
-        suite.addTestSuite(FailServiceUITestGWT.class);
-        suite.addTestSuite(MethodServiceUITestGWT.class);
-        suite.addTestSuite(JSONBindingUITestGWT.class);
-        return suite;
-    }
-}
+/**
+ * Copyright (C) 2009-2012 the original author or authors.
+ * See the notice.md file distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * Licensed 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.
+ */
+
+package org.fusesource.restygwt.examples.client;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import com.google.gwt.junit.tools.GWTTestSuite;
+
+/**
+ *
+ * @author <a href="http://hiramchirino.com">Hiram Chirino</a>
+ */
+public class RestyGWTTestSuite extends GWTTestSuite {
+    public static Test suite() {
+        TestSuite suite = new TestSuite("GWT Tests for RestyGWT");
+        suite.addTestSuite(PizzaServiceUITestGWT.class);
+        suite.addTestSuite(ResourceUITestGWT.class);
+        suite.addTestSuite(FailServiceUITestGWT.class);
+        suite.addTestSuite(MethodServiceUITestGWT.class);
+        suite.addTestSuite(JSONBindingUITestGWT.class);
+        return suite;
+    }
+}

restygwt/src/it/restygwt-jersey-jaxb-example/pom.xml → restygwt-examples/restygwt-jersey-jaxb-example/pom.xml

@@ -25,11 +25,11 @@
 
     <parent>
         <groupId>org.fusesource.restygwt</groupId>
-        <artifactId>restygwt-it-parent</artifactId>
-        <version>@project.version@</version>
+        <artifactId>restygwt-examples</artifactId>
+        <version>2.2.3-SNAPSHOT</version>
     </parent>
     <artifactId>restygwt-jersey-jaxb-example</artifactId>
-    <version>@project.version@</version>
+    <version>2.2.3-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <name>RestyGWT Jersey JAXB Example</name>