From 033e69f0e86e2e29f37091d42d2afbe6aaa70df0 Mon Sep 17 00:00:00 2001
From: cfalzone <cfalzone@aquent.com>
Date: Thu, 5 Dec 2013 09:28:03 -0500
Subject: [PATCH] WEB-180 Cleaned up the build

---
 EXPORTS                                       |   4 -
 META-INF/MANIFEST.MF                          |  17 ---
 README.md                                     |  33 +++--
 build.gradle                                  |  39 ++++++
 build.xml                                     | 117 ------------------
 .../com.aquent.plugins.twittertool-0.1.jar}   | Bin 530012 -> 519878 bytes
 .../com/aquent/viewtools/TwitterTool.java     |   0
 .../viewtools/TwitterToolActivator.java       |   0
 .../com/aquent/viewtools/TwitterToolInfo.java |   0
 .../resources/lib}/twitter4j-async-3.0.3.jar  | Bin
 .../resources/lib}/twitter4j-core-3.0.3.jar   | Bin
 .../lib}/twitter4j-media-support-3.0.3.jar    | Bin
 .../resources/lib}/twitter4j-stream-3.0.3.jar | Bin
 13 files changed, 61 insertions(+), 149 deletions(-)
 delete mode 100644 EXPORTS
 delete mode 100644 META-INF/MANIFEST.MF
 create mode 100644 build.gradle
 delete mode 100644 build.xml
 rename build/{jar/bundle-com.aquent.plugins.twittertool.jar => libs/com.aquent.plugins.twittertool-0.1.jar} (96%)
 rename src/{ => main/java}/com/aquent/viewtools/TwitterTool.java (100%)
 rename src/{ => main/java}/com/aquent/viewtools/TwitterToolActivator.java (100%)
 rename src/{ => main/java}/com/aquent/viewtools/TwitterToolInfo.java (100%)
 rename {lib => src/main/resources/lib}/twitter4j-async-3.0.3.jar (100%)
 rename {lib => src/main/resources/lib}/twitter4j-core-3.0.3.jar (100%)
 rename {lib => src/main/resources/lib}/twitter4j-media-support-3.0.3.jar (100%)
 rename {lib => src/main/resources/lib}/twitter4j-stream-3.0.3.jar (100%)

diff --git a/EXPORTS b/EXPORTS
deleted file mode 100644
index 2e4e9f2..0000000
--- a/EXPORTS
+++ /dev/null
@@ -1,4 +0,0 @@
-,com.dotmarketing.beans,
-com.dotmarketing.business,
-com.dotmarketing.util,
-twitter4j
\ No newline at end of file
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
deleted file mode 100644
index 4d88965..0000000
--- a/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Author: Aquent, LLC (cfalzone@aquent.com)
-Bundle-Name: Twitter OSGI Viewtool
-Bundle-Activator: com.aquent.viewtools.TwitterToolActivator
-Bundle-SymbolicName: Twitter OSGI Viewtool
-Bundle-Version: 1.0.0
-Bundle-RequiredExecutionEnvironment: OSGi/Minimum-1.0
-Bundle-ClassPath: .,lib/twitter4j-async-3.0.3.jar,lib/twitter4j-core-3.0.3.jar,lib/twitter4j-media-support-3.0.3.jar,lib/twitter4j-stream-3.0.3.jar
-DynamicImport-Package: *
-Import-Package:  org.osgi.service.http,
- org.apache.felix.http.api,
- org.apache.velocity.tools,
- org.apache.velocity.tools.view,
- org.apache.velocity.tools.view.tools,
- com.dotmarketing.util,
- com.dotmarketing.beans,
- com.dotmarketing.business
diff --git a/README.md b/README.md
index 3dfe758..375f674 100644
--- a/README.md
+++ b/README.md
@@ -2,14 +2,8 @@ Twitter OSGI Viewtool
 =================================================
 An osgi plugin for dotCMS that adds a viewtool for interacting with Twitter using Twitter4J.
 
-Installation
-==================================
-* Navigate to the dotCMS Dynamic plugins page: "System" > "Dynamic Plugins"
-* Click on "Upload plugin" and select the .jar file located in the "build/jar/" folder
-* Click on "Exported Packages" and add the contents of the EXPORTS file to the bottom of the list   
-
 Twitter4J Configuration
-===================================
+-----------------------
 You need to create the following host variables and enter the values in your Default Host:
 
 twitter4JConsumerKey - Text
@@ -20,8 +14,20 @@ twitter4jDebug - Boolean (Select or Radio with True/False)
   
 For More information see the Twitter4J website:  http://twitter4j.org/en/configuration.html
 
-Usage:
-======
+Installation
+------------
+* Make sure you have the Twitter4J Configuration setup before deploying the osgi jar
+* Navigate to the dotCMS Dynamic plugins page: "System" > "Dynamic Plugins"
+* Click on "Upload plugin" and select the .jar file located in the "build/jar/" folder
+* Click on "Exported Packages" and add the following to the bottom of the list  
+```
+,com.dotmarketing.beans,
+com.dotmarketing.business,
+com.dotmarketing.util
+```
+
+Usage
+------
 You will want to have to Twitter4J JavaDoc handy:  http://twitter4j.org/javadoc/index.html
 
 The tool is mapped to the key $twitter and currently has the following methods implemented:
@@ -160,6 +166,11 @@ If a method is not working check your log file, you probably exceeded the twitte
 </dl>
 ```
 
-Additional Info:
-====================================
+Building
+--------
+* Install Gradle (if not already installed)
+* gradle jar 
+
+Additional Info
+----------------
 This plugin includes software from Twitter4J.org.  You can see the license term at http://twitter4j.org/en/index.html#license
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..5a61481
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,39 @@
+apply plugin: 'war'
+apply plugin: 'osgi'
+apply plugin: 'eclipse'
+
+sourceCompatibility = '1.6'
+version = '1.0'
+
+repositories {
+	maven {
+        url "http://repo.dotcms.com/artifactory/libs-release"
+    }
+}
+
+dependencies {
+	compile (group: 'com.dotcms', name: 'dotcms', version: '2.5.1'){
+		transitive = true
+	}
+	providedCompile "javax.servlet:servlet-api:2.5"
+	compile fileTree(dir: 'src/main/resources/lib', include: '*.jar')
+}
+
+jar {
+    manifest {
+        name = 'Aquent TwitterTool'
+        symbolicName = 'com.aquent.plugins.twittertool'
+        instruction 'Bundle-Vendor', 'Aquent, LLC (cfalzone@aquent.com)'
+        instruction 'Bundle-Description', 'Aquent TwiterTool Plugin'
+        instruction 'Bundle-DocURL', 'http://www.aquent.com'
+        instruction 'Bundle-Activator', 'com.aquent.viewtools.TwitterToolActivator'
+        instruction 'Bundle-ClassPath', '.', 
+			'lib/twitter4j-async-3.0.3.jar',
+			'lib/twitter4j-core-3.0.3.jar',
+			'lib/twitter4j-media-support-3.0.3.jar',
+			'lib/twitter4j-stream-3.0.3.jar'
+        instruction 'DynamicImport-Package', '*'
+        instruction 'Import-Package', '!org.springframework.*', '!twitter4j.*', '*;version=0'
+    }
+}
+
diff --git a/build.xml b/build.xml
deleted file mode 100644
index f918abe..0000000
--- a/build.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<project name="Bundle Builder" default="build">
-
-    <basename file="${basedir}" property="plugin.name"/>
-
-    <property name="build.dir" value="build"/>
-    <property name="src.dir" value="src"/>
-    <property name="jar.name" value="bundle-${plugin.name}.jar"/>
-    <property name="jar.file" value="${build.dir}/jar/${jar.name}"/>
-
-    <property name="app.base" value="/Users/cfalzone/dev/dotcms/master2.5"/>
-    <property name="lib.app" value="${app.base}/dotCMS/WEB-INF/lib"/>
-    <property name="lib.bundles" value="${app.base}/dotCMS/WEB-INF/felix/bundle"/>
-    <property name="lib.server" value="${app.base}/tomcat/lib"/>
-    <property name="deploy.dir" value="${app.base}/dotCMS/WEB-INF/felix/load"/>
-    <property name="build.classes" value="${build.dir}/classes"/>
-
-    <property name="meta-inf.dir" value="META-INF"/>
-    <property name="classpath.dir" value="classpath"/>
-    <property name="manifest.file" value="${meta-inf.dir}/MANIFEST.MF"/>
-
-    <path id="files-classpath">
-        <fileset dir="${lib.app}">
-            <include name="**/*.jar"/>
-        </fileset>
-        <fileset dir="${lib.bundles}">
-            <include name="**/*.jar"/>
-        </fileset>
-        <fileset dir="lib">
-            <include name="**/*.jar"/>
-        </fileset>
-        <fileset dir="${lib.server}">
-            <include name="**/*.jar"/>
-        </fileset>
-        <!--Bundles can depend on other bundles-->
-        <fileset dir="${deploy.dir}">
-            <include name="**/*.jar"/>
-        </fileset>
-        <pathelement path="${build.classes}"/>
-        <pathelement path="../../build/classes"/>
-    </path>
-
-    <target name="build" depends="clean,compile,jar"/>
-    <target name="compile">
-
-        <echo>Building at: ${plugin.name} at ${basedir}</echo>
-        <mkdir dir="${build.classes}"/>
-        <mkdir dir="${src.dir}"/>
-        <!--
-          CREATE THE LIB DIRECTORIES IF IT DOESN'T EXIST.
-          THIS PREVENTS THE javac TASK FROM FAILING
-          -->
-        <mkdir dir="lib"/>
-        <javac debug="true" debuglevel="lines,vars,source" fork="true" srcdir="${src.dir}" destdir="${build.classes}"
-               source="1.5" target="1.5" compiler="javac1.5" nowarn="true" optimize="true" memoryinitialsize="256m"
-               memorymaximumsize="512m">
-            <classpath refid="files-classpath"/>
-        </javac>
-        <!-- copying other resource within src folder in the classpath -->
-        <copy todir="${build.classes}">
-            <fileset dir="${src.dir}">
-                <exclude name="**/*.java"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="jar" depends="compile,doif">
-        <mkdir dir="${build.dir}/jar"/>
-
-        <!--
-          CREATE DIRECTORIES THAT DON'T EXIST.
-          THIS PREVENTS THE jar TASK FROM FAILING
-          -->
-        <mkdir dir="${build.classes}"/>
-        <mkdir dir="lib"/>
-
-        <jar jarfile="${jar.file}" manifest="${manifest.file}">
-            <metainf dir="${meta-inf.dir}" />
-            <fileset dir="${build.classes}"/>
-            <!--<zipfileset dir="lib" prefix="lib"/>-->
-            <!--<zipfileset dir="${web-inf.dir}" prefix="${web-inf.dir}"/>-->
-
-            <zipfileset dir=".">
-                <exclude name="src/**"/>
-                <exclude name="build/**"/>
-                <exclude name="META-INF/**"/>
-                <exclude name="build.xml"/>
-            </zipfileset>
-
-            <!--<service type="org.apache.commons.logging.LogFactory" provider="org.apache.commons.logging.impl.LogFactoryImpl"/>-->
-            <!--<service type="javax.xml.parsers.DocumentBuilderFactory" provider="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/>-->
-        </jar>
-
-    </target>
-
-    <target name="doif" depends="checkFileExists, if_target"/>
-    <target name="checkFileExists">
-        <condition property="p">
-            <available file="${classpath.dir}"/>
-        </condition>
-    </target>
-    <target name="if_target" if="p">
-        <jar destfile="${lib.app}/bundle-${plugin.name}-classpath.jar" basedir="${classpath.dir}"/>
-    </target>
-
-    <target name="clean">
-        <delete dir="${build.dir}"/>
-    </target>
-
-    <target name="deploy">
-        <copy file="${jar.file}" tofile="${deploy.dir}/${jar.name}"/>
-    </target>
-
-    <target name="undeploy">
-        <delete file="${deploy.dir}/${jar.name}"/>
-    </target>
-
-</project>
\ No newline at end of file
diff --git a/build/jar/bundle-com.aquent.plugins.twittertool.jar b/build/libs/com.aquent.plugins.twittertool-0.1.jar
similarity index 96%
rename from build/jar/bundle-com.aquent.plugins.twittertool.jar
rename to build/libs/com.aquent.plugins.twittertool-0.1.jar
index d34704bf9251f8fc219402e49aff7465a0aaa8a0..f8569deaa67a08e3e30ba84be693490f58c0b6e2 100644
GIT binary patch
delta 5514
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
YHY67fkcW&EKnlpj0RR~G2(IA&2jz;MO#lD@

delta 15444
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
VGjIwx%y+9R0RsX`hySqn{|EKG$_fAg

diff --git a/src/com/aquent/viewtools/TwitterTool.java b/src/main/java/com/aquent/viewtools/TwitterTool.java
similarity index 100%
rename from src/com/aquent/viewtools/TwitterTool.java
rename to src/main/java/com/aquent/viewtools/TwitterTool.java
diff --git a/src/com/aquent/viewtools/TwitterToolActivator.java b/src/main/java/com/aquent/viewtools/TwitterToolActivator.java
similarity index 100%
rename from src/com/aquent/viewtools/TwitterToolActivator.java
rename to src/main/java/com/aquent/viewtools/TwitterToolActivator.java
diff --git a/src/com/aquent/viewtools/TwitterToolInfo.java b/src/main/java/com/aquent/viewtools/TwitterToolInfo.java
similarity index 100%
rename from src/com/aquent/viewtools/TwitterToolInfo.java
rename to src/main/java/com/aquent/viewtools/TwitterToolInfo.java
diff --git a/lib/twitter4j-async-3.0.3.jar b/src/main/resources/lib/twitter4j-async-3.0.3.jar
similarity index 100%
rename from lib/twitter4j-async-3.0.3.jar
rename to src/main/resources/lib/twitter4j-async-3.0.3.jar
diff --git a/lib/twitter4j-core-3.0.3.jar b/src/main/resources/lib/twitter4j-core-3.0.3.jar
similarity index 100%
rename from lib/twitter4j-core-3.0.3.jar
rename to src/main/resources/lib/twitter4j-core-3.0.3.jar
diff --git a/lib/twitter4j-media-support-3.0.3.jar b/src/main/resources/lib/twitter4j-media-support-3.0.3.jar
similarity index 100%
rename from lib/twitter4j-media-support-3.0.3.jar
rename to src/main/resources/lib/twitter4j-media-support-3.0.3.jar
diff --git a/lib/twitter4j-stream-3.0.3.jar b/src/main/resources/lib/twitter4j-stream-3.0.3.jar
similarity index 100%
rename from lib/twitter4j-stream-3.0.3.jar
rename to src/main/resources/lib/twitter4j-stream-3.0.3.jar