Merge pull request #5 from Yamaha32088/fix-connection-errors

Fix connection errors

.gitignore

@@ -0,0 +1,13 @@
+/dist
+**/Test.java
+**/.DS_Store
+**/.svn/
+/*.project
+va specific
+*.class
+target
+target/*
+*.lock
+*.DS_Store
+/build/
+/source/lucee-server/

README.md

@@ -6,7 +6,7 @@ Clone of https://github.com/nmische/cf-redis-sub-gateway and adapted to work wit
 # License
 MIT License
 
-Copyright (c) 2018 Brandon Brown
+Copyright (c) 2019 Brandon Brown
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

build.number

@@ -0,0 +1,3 @@
+#Build Number for ANT. Do not edit!
+#Fri Mar 08 09:23:56 CST 2019
+build.number=109

build.properties

@@ -0,0 +1,8 @@
+bundlename: com.squidfoundry
+codename: RedisPubSub
+filename: RedisPubSub-extension
+bundleversion: 2.0.0.
+id: 1B411F3B-76A5-46F4-88CB2364D9C913C3
+appendix: -Beta
+label: Lucee Redis PubSub (BETA)
+description: Extension that will allow you to add a gateway for Redis PubSub

build.xml

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="clean" basedir="." name="com.squidfoundry.redispubsub-extension">
+	<description>
+		Redis PubSub extension for Lucee
+	</description>
+
+	<property file="build.properties" />
+
+	<property name="lib" location="source/java/libs" />
+	<property name="src" location="source/java/src" />
+	<property name="temp" location="temp" />
+	<property name="build" location="build" />
+	<property name="dist" location="dist" />
+
+	<property name="context" location="source/context" />
+
+	<buildnumber file="build.number" />
+
+	<scriptdef name="replace" language="javascript">
+		<attribute name="haystack" />
+		<attribute name="needle" />
+		<attribute name="repl" />
+		<attribute name="property" />
+		<![CDATA[
+	      var text = attributes.get("haystack");
+	      var needle = attributes.get("needle");
+	      var repl = attributes.get("repl");
+	      text=text.trim();
+	      var regex = new RegExp(needle,'g');
+	      text=text.replace(regex,repl);
+	      project.setProperty(attributes.get("property"), text);
+	     ]]>
+	</scriptdef>
+
+	<path id="classpath">
+		<fileset dir="${lib}">
+			<include name="**/*.jar" />
+		</fileset>
+	</path>
+
+	<target name="init">
+		<tstamp />
+		<delete dir="${temp}" />
+		<delete dir="${dist}" />
+
+		<mkdir dir="${temp}" />
+		<mkdir dir="${build}" />
+		<mkdir dir="${dist}/" />
+	</target>
+
+	<target name="build-for-tests" depends="get-dependencies,clean" />
+
+	<target name="get-dependencies">
+		<get src="http://central.maven.org/maven2/org/lucee/lucee/${lucee.version}/lucee-${lucee.version}.jar" dest="source/java/libs/lucee.jar" />
+		<get src="http://central.maven.org/maven2/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0.jar" dest="source/java/libs/javax.servlet.jar" />
+		<get src="http://central.maven.org/maven2/javax/servlet/jsp/jsp-api/2.2/jsp-api-2.2.jar" dest="source/java/libs/jsp-api.jar" />
+	</target>
+
+	<target name="copy" depends="init" description="copy source file to temp">
+		<copy todir="${temp}">
+			<fileset dir="${src}">
+				<include name="**/*.java" />
+				<exclude name="**/Test.java" />
+			</fileset>
+		</copy>
+
+		<tstamp>
+			<format property="NOW" pattern="yyyy-MM-dd HH:mm:ss" />
+		</tstamp>
+
+		<echo file="${dist}/extension/META-INF/MANIFEST.MF">Manifest-Version: 1.0
+Built-Date: ${NOW}
+version: "${bundleversion}${build.number}${appendix}"
+id: "${id}"
+name: "${label}"
+description: "${description}"
+start-bundles: true
+</echo>
+	</target>
+
+	<target name="compile" depends="copy" description="compile the source">
+		<javac srcdir="${temp}" target="1.8" destdir="${build}" debug="true" debuglevel="lines,vars,source" includeantruntime="false">
+			<classpath refid="classpath" />
+		</javac>
+	</target>
+
+	<target name="dist" depends="compile" description="generate the distribution">
+		<jar jarfile="${dist}/extension/jars/${filename}-${bundleversion}${build.number}${appendix}.jar" basedir="${build}" manifest="${src}/META-INF/MANIFEST.MF">
+			<manifest>
+				<attribute name="Bundle-Version" value="${bundleversion}${build.number}${appendix}" />
+				<attribute name="Built-Date" value="${NOW}" />
+				<attribute name="Bundle-SymbolicName" value="${bundlename}" />
+			</manifest>
+		</jar>
+
+		<copy todir="${dist}/extension/jars">
+			<fileset dir="${lib}">
+				<exclude name="**/lucee.jar" />
+			</fileset>
+		</copy>
+
+		<copy todir="${dist}/extension/context">
+			<fileset dir="${context}"></fileset>
+		</copy>
+
+		<zip destfile="${dist}/${filename}-${bundleversion}${build.number}${appendix}.lex">
+			<zipfileset dir="${dist}/extension" />
+		</zip>
+
+	</target>
+
+	<target name="clean" depends="dist" description="clean up">
+		<delete dir="${build}" />
+		<delete dir="${temp}" />
+	</target>
+
+</project>

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.squidfoundry</groupId>
   <artifactId>lucee-redis-pubsub</artifactId>
-  <version>1.0.0</version>
+  <version>1.1.0</version>
 
   <name>Lucee Redis PubSub</name>
   <description>Enables Redis PubSub features in Lucee</description>
@@ -27,7 +27,7 @@
                 </configuration>
          	</plugin>
          </plugins>
-   </build>   
+   </build>
 
   <dependencies>
     <dependency>
@@ -43,5 +43,12 @@
 	    <type>jar</type>
 	    <scope>compile</scope>
 	</dependency>
+	<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-pool2 -->
+	<dependency>
+	    <groupId>org.apache.commons</groupId>
+	    <artifactId>commons-pool2</artifactId>
+	    <version>2.4.1</version>
+	</dependency>
   </dependencies>
+  <packaging>maven-plugin</packaging>
 </project>

source/context/admin/gdriver/LuceeRedisPubSub.cfc

@@ -0,0 +1,51 @@
+component extends='Gateway' {
+
+    variables.fields = array(
+        field(
+            'Host',
+            'host',
+            '127.0.0.1',
+            true,
+            'The host path Redis instance',
+            'text'
+        ), field(
+            'Port',
+            'port',
+            '6379',
+            true,
+            'The port number Redis instance',
+            'text'
+        ), field(
+            'Password',
+            'auth',
+            '',
+            false,
+            'Password for Redis instance (optional)',
+            'text'
+        ), field(
+            'Channel',
+            'channel',
+            'foo.bar',
+            true,
+            'The channel to subscribe to',
+            'text'
+        )
+    );
+
+    string function getListenerCfcMode() {
+    	return 'required';
+    }
+
+    string function getClass() {
+        return 'com.squidfoundry.RedisPubSub';
+    }
+
+    string function getLabel() {
+        return 'Lucee Redis Pub/Sub Gateway';
+    }
+
+    string function getDescription() {
+        return 'This gateway handles Redis Pub/Sub events';
+    }
+
+}

source/java/libs/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

source/java/src/META-INF/MANIFEST.MF

@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Export-Package: com.squidfoundry
+Bundle-ManifestVersion: 2
+Require-Bundle: redis.clients.jedis;bundle-version=2.9.0,
+ org.apache.commons.pool2;bundle-version=2.4.1