FORGE-224: Added Tracking APIs

gastaldi · Jan 7, 2013 · 54326b6 · 54326b6
1 parent c5048fd
commit 54326b6
Show file tree

Hide file tree

Showing 13 changed files with 573 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,7 @@ target/
 *.ipr
 *.iws
 /*/src/main/java/META-INF
-.gitignore.swp
+*.swp
 docs/reference/src/main/docbook/en-US/version_info.xml
 .idea
 .forge_settings

diff --git a/dist/build.xml b/dist/build.xml
@@ -216,7 +216,7 @@
 		<module-def name="org.apache.commons.codec">
 			<maven-resource group="commons-codec" artifact="commons-codec" />
 		</module-def>
-		
+
 		<module-def name="org.apache.commons.logging" />
 
 		<module-def name="org.apache.httpcomponents">
@@ -248,7 +248,7 @@
 		<!-- BEGIN Forge Modules -->
 		<module-def name="org.jboss.forge">
 			<maven-resource group="org.jboss.forge" artifact="forge-shell" />
-			
+
 			<!-- TODO make this a separate auto-install plugin -->
 			<maven-resource group="org.jboss.forge" artifact="forge-dev-plugins" />
 		</module-def>
@@ -257,7 +257,7 @@
 			<maven-resource group="org.jboss.forge" artifact="forge-event-bus" />
 		</module-def>
 
-		<!-- TODO this needs to be an extension, not built in (consider 
+		<!-- TODO this needs to be an extension, not built in (consider
 		dynamically providing extensions to the system via custom module loader) -->
 		<module-def name="org.jboss.forge.javaee.api">
 			<maven-resource group="org.jboss.forge" artifact="forge-javaee-api" />
@@ -275,7 +275,7 @@
 		<module-def name="org.jboss.forge.maven.api">
 			<maven-resource group="org.jboss.forge" artifact="forge-maven-api" />
 
-			
+
 			<!-- TODO this needs to be pulled into a module -->
 			<maven-resource group="commons-cli" artifact="commons-cli" />
 			<maven-resource group="org.apache.maven" artifact="maven-aether-provider" />
@@ -328,11 +328,11 @@
 		<module-def name="org.jboss.forge.parser.xml">
 			<maven-resource group="org.jboss.forge" artifact="forge-parser-xml" />
 		</module-def>
-		
+
 		<module-def name="org.jboss.forge.scaffold.api">
 			<maven-resource group="org.jboss.forge" artifact="forge-scaffold-api" />
 		</module-def>
-		
+
 		<module-def name="org.jboss.forge.scaffold.impl">
 			<maven-resource group="org.jboss.forge" artifact="forge-scaffold-plugins" />
 			<maven-resource group="org.jboss.forge" artifact="forge-scaffold-faces" />
@@ -342,6 +342,10 @@
 		<module-def name="org.jboss.forge.shell.api">
 			<maven-resource group="org.jboss.forge" artifact="forge-shell-api" />
 		</module-def>
+
+		<module-def name="org.jboss.forge.tracking">
+			<maven-resource group="org.jboss.forge" artifact="forge-tracking" />
+		</module-def>
 		<!-- END Forge Modules -->
 
 		<module-def name="org.jboss.interceptor">
@@ -355,7 +359,7 @@
 		<module-def name="javax.interceptor.api">
 			<maven-resource group="org.jboss.spec.javax.interceptor" artifact="jboss-interceptors-api_1.1_spec" />
 		</module-def>
-        
+
         <module-def name="org.jboss.logging">
             <maven-resource group="org.jboss.logging" artifact="jboss-logging"/>
         </module-def>
@@ -423,6 +427,9 @@
 
 		<module-def name="sun.misc" />
 
+		<module-def name="com.dmurph.JGoogleAnalyticsTracker">
+			<maven-resource group="com.dmurph" artifact="JGoogleAnalyticsTracker" />
+		</module-def>
 	</target>
 
 	<target name="bundles">

diff --git a/dist/pom.xml b/dist/pom.xml
@@ -219,6 +219,11 @@
          <artifactId>forge-shell</artifactId>
       </dependency>
 
+      <dependency>
+         <groupId>org.jboss.forge</groupId>
+         <artifactId>forge-tracking</artifactId>
+      </dependency>
+
       <dependency>
          <groupId>org.jboss.interceptor</groupId>
          <artifactId>jboss-interceptor-core</artifactId>

diff --git a/dist/src/main/resources/modules/com/dmurph/JGoogleAnalyticsTracker/main/module.xml b/dist/src/main/resources/modules/com/dmurph/JGoogleAnalyticsTracker/main/module.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2012 Red Hat, Inc. and/or its affiliates.
+ ~
+ ~ Licensed under the Eclipse Public License version 1.0, available at
+ ~ http://www.eclipse.org/legal/epl-v10.html
+-->
+
+<module xmlns="urn:jboss:module:1.0" name="com.dmurph.JGoogleAnalyticsTracker">
+    <resources>
+        <!-- Insert resources here -->
+    </resources>
+
+    <dependencies>
+        <module name="org.slf4j" />
+        <module name="javax.api"/>
+    </dependencies>
+</module>
diff --git a/dist/src/main/resources/modules/org/jboss/forge/main/module.xml b/dist/src/main/resources/modules/org/jboss/forge/main/module.xml
@@ -17,7 +17,7 @@
 
    <dependencies>
       <module name="com.sun.xml.bind" />
-   
+
       <module name="javax.annotation.api" />
       <module name="javax.interceptor.api" />
       <module name="jline" />
@@ -109,14 +109,21 @@
             <include path="META-INF" />
          </imports>
       </module>
-
+
+      <module name="org.jboss.forge.tracking" services="import">
+         <imports>
+            <include path="**" />
+            <include path="META-INF" />
+         </imports>
+      </module>
+
       <module name="org.jboss.seam.render" services="import">
          <imports>
             <include path="**" />
             <include path="META-INF" />
          </imports>
       </module>
-      
+
       <module name="org.jboss.solder" services="import">
          <imports>
             <include path="**" />
@@ -131,7 +138,7 @@
             <include path="META-INF" />
          </imports>
       </module>
-      
+
       <module name="org.jboss.weld.core" services="import" />
       <module name="org.jboss.weld.spi" services="import" />
       <module name="org.jboss.weld.api" services="import" />
@@ -140,7 +147,7 @@
       <module name="org.yaml" />
       <module name="sun.jdk" />
       <module name="sun.misc" />
-      
+
       <module name="javax.api" />
    </dependencies>
 

diff --git a/dist/src/main/resources/modules/org/jboss/forge/tracking/main/module.xml b/dist/src/main/resources/modules/org/jboss/forge/tracking/main/module.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2012 Red Hat, Inc. and/or its affiliates.
+ ~
+ ~ Licensed under the Eclipse Public License version 1.0, available at
+ ~ http://www.eclipse.org/legal/epl-v10.html
+-->
+
+<module xmlns="urn:jboss:module:1.0" name="org.jboss.forge.tracking">
+
+   <resources>
+      <!-- Insert resources here -->
+   </resources>
+
+   <dependencies>
+      <module name="org.jboss.forge.shell.api" services="import">
+         <imports>
+            <include path="**" />
+            <include path="META-INF" />
+         </imports>
+      </module>
+
+      <module name="com.dmurph.JGoogleAnalyticsTracker" />
+      <module name="javax.api" />
+   </dependencies>
+
+</module>
diff --git a/pom.xml b/pom.xml
@@ -339,6 +339,12 @@
             <version>${project.version}</version>
          </dependency>
 
+         <dependency>
+            <groupId>org.jboss.forge</groupId>
+            <artifactId>forge-tracking</artifactId>
+            <version>${project.version}</version>
+         </dependency>
+
          <dependency>
             <groupId>org.eclipse.jgit</groupId>
             <artifactId>org.eclipse.jgit.pgm</artifactId>
@@ -857,6 +863,7 @@
             <module>scaffold-faces</module>
             <module>dev-plugins</module>
             <module>plugin-loader</module>
+            <module>tracking</module>
             <module>dist</module>
          </modules>
       </profile>
@@ -887,5 +894,4 @@
       <developerConnection>${forge.developer.connection}</developerConnection>
       <url>${forge.scm.url}</url>
    </scm>
-
 </project>
diff --git a/test-harness/src/main/java/org/jboss/forge/test/AbstractShellTest.java b/test-harness/src/main/java/org/jboss/forge/test/AbstractShellTest.java
@@ -52,6 +52,7 @@ public abstract class AbstractShellTest
    static
    {
       System.setProperty("forge.debug.no_auto_init_streams", "true");
+      System.setProperty("forge.analytics.no_prompt", "true");
    }
 
    @Deployment

diff --git a/test-harness/src/main/java/org/jboss/forge/test/SingletonAbstractShellTest.java b/test-harness/src/main/java/org/jboss/forge/test/SingletonAbstractShellTest.java
@@ -51,8 +51,9 @@ public abstract class SingletonAbstractShellTest
    static
    {
       System.setProperty("forge.debug.no_auto_init_streams", "true");
+      System.setProperty("forge.analytics.no_prompt", "true");
    }
-   
+
    @Deployment
    public static JavaArchive getDeployment()
    {

diff --git a/tracking/pom.xml b/tracking/pom.xml
@@ -0,0 +1,26 @@
+<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>
+   <parent>
+      <groupId>org.jboss.forge</groupId>
+      <artifactId>forge-parent</artifactId>
+      <version>1.1.4-SNAPSHOT</version>
+      <relativePath>../pom.xml</relativePath>
+   </parent>
+
+   <artifactId>forge-tracking</artifactId>
+   <name>Forge - Tracking</name>
+
+   <dependencies>
+      <dependency>
+         <groupId>org.jboss.forge</groupId>
+         <artifactId>forge-shell-api</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>com.dmurph</groupId>
+         <artifactId>JGoogleAnalyticsTracker</artifactId>
+         <version>1.2.0</version>
+      </dependency>
+   </dependencies>
+
+</project>