Flesh out project, add version resource

build.xml

@@ -11,8 +11,15 @@
     <mkdir dir="${build}"/>
   </target>
 
-  <target name="compile" depends="init" description="compile the source">
-    <javac srcdir="${src}" destdir="${build}" includeantruntime="false"/>
+  <target name="compile" depends="init,-get-version" description="compile the source">
+    <path id="compile-classpath">
+      <fileset dir="lib">
+        <include name="**/*.jar"/>
+      </fileset>
+    </path>
+
+    <javac srcdir="${src}" destdir="${build}" includeantruntime="false" classpathref="compile-classpath"/>
+    <echo file="${build}/name/smithc/chris/version">${version}</echo>
   </target>
 
   <target name="-init-version">
@@ -24,10 +31,13 @@
     <taskdef name="git-describe" classname="org.mdonoughe.JGitDescribeTask" classpathref="jgit-classpath"/>
   </target>
 
-  <target name="dist" depends="compile,-init-version" description="generate the distribution">
+  <target name="-get-version" depends="-init-version">
+    <git-describe dir=".git" property="version" />
+  </target>
+
+  <target name="dist" depends="compile,-get-version" description="generate the distribution">
     <mkdir dir="${dist}"/>
 
-    <git-describe dir=".git" property="version" />
     <jar jarfile="${dist}/RestIRC-${version}.jar" basedir="${build}"/>
   </target>
 
@@ -35,4 +45,15 @@
     <delete dir="${build}"/>
     <delete dir="${dist}"/>
   </target>
+
+  <target name="run" depends="compile">
+    <path id="run-classpath">
+      <pathelement path="${build}"/>
+      <fileset dir="lib">
+        <include name="**/*.jar"/>
+      </fileset>
+    </path>
+
+    <java classpathref="run-classpath" classname="name.smith.chris.restirc.RestIrc"/>
+  </target>
 </project>

etc/ivy/ivysettings.xml

@@ -7,7 +7,7 @@
 
         <ibiblio name="sonatype" root="https://oss.sonatype.org/content/repositories/snapshots/" m2compatible="true"/>
 
-        <ibiblio name="java" root="https://maven.java.net/content/repositories/snapshots/" m2compatible="true"/>
+        <ibiblio name="java" root="https://maven.java.net/content/repositories/releases/" m2compatible="true"/>
 
         <url name="jgit-describe">
             <ivy pattern="file:///${basedir}/etc/ivy/[module]/ivy.xml"/>
@@ -36,6 +36,7 @@
         <module organisation="org.eclipse.jgit" name="*" resolver="jgit"/>
         <module organisation="com.github.peichhorn" name="*" resolver="sonatype"/>
         <module organisation="com.sun.*" name="*" resolver="java"/>
+        <module organisation="javax.*" name="*" resolver="java"/>
         <module organisation="com.dmdirc" name="parser-common" resolver="dmdirc-parser-common"/>
         <module organisation="com.dmdirc" name="parser-irc" resolver="dmdirc-parser-irc"/>
         <module organisation="com.dmdirc" name="util" resolver="dmdirc-util"/>

ivy.xml

@@ -3,7 +3,7 @@
 
     <configurations>
         <conf name="build" description="Everything needed to support the build process"/>
-        <conf name="compile" description="Everything needed to compile RestIRC separately"/>
+        <conf name="compile" description="Everything needed to compile RestIRC"/>
         <conf name="test" description="Everything needed to test RestIRC"/>
         <conf name="default" extends="build,compile,test"/>
     </configurations>
@@ -16,7 +16,12 @@
 
         <dependency org="com.github.peichhorn" name="lombok-pg" rev="0.10.8-SNAPSHOT" conf="compile->default" />
 
-        <dependency org="com.sun.jersey" name="jersey-server" rev="1.12-SNAPSHOT" conf="compile->default"/>
+        <dependency org="com.sun.jersey" name="jersey-core" rev="1.+" conf="compile->default"/>
+        <dependency org="com.sun.jersey" name="jersey-server" rev="1.+" conf="compile->default"/>
+        <dependency org="com.sun.jersey" name="jersey-grizzly2" rev="1.+" conf="compile->default"/>
+        <dependency org="com.sun.jersey" name="jersey-json" rev="1.+" conf="compile->default"/>
+        <dependency org="javax.ws.rs" name="javax.ws.rs-api" rev="2.+" conf="compile->default"/>
+
         <dependency org="com.dmdirc" name="parser-common" rev="latest.integration" conf="compile->default"/>
         <dependency org="com.dmdirc" name="parser-irc" rev="latest.integration" conf="compile->default"/>
         <dependency org="com.dmdirc" name="util" rev="latest.integration" conf="compile->default"/>
@@ -25,5 +30,6 @@
         <dependency org="org.mockito" name="mockito-all" rev="1.+" conf="test->default" />
 
         <exclude org="ant" module="ant"/>
+        <exclude org="com.sun.xml.bind" module="jaxb-impl"/>
     </dependencies>
 </ivy-module>

nbproject/project.xml

@@ -39,6 +39,9 @@
                     <target>clean</target>
                     <target>compile</target>
                 </action>
+                <action name="run">
+                    <target>run</target>
+                </action>
             </ide-actions>
             <export>
                 <type>folder</type>
@@ -63,6 +66,7 @@
                     <ide-action name="build"/>
                     <ide-action name="rebuild"/>
                     <ide-action name="clean"/>
+                    <ide-action name="run"/>
                 </context-menu>
             </view>
             <subprojects/>
@@ -70,7 +74,7 @@
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3">
             <compilation-unit>
                 <package-root>src</package-root>
-                <classpath mode="compile">lib/asm-3.1.jar:lib/hamcrest-core-1.1.jar:lib/ivy-2.2.0.jar:lib/jersey-server-1.12-SNAPSHOT.jar:lib/jgit-describe-0.1.jar:lib/jsch-0.1.44-1.jar:lib/junit-4.10.jar:lib/logback-classic-1.0.0.jar:lib/logback-core-1.0.0.jar:lib/lombok-pg-0.10.8-SNAPSHOT.jar:lib/mockito-all-1.9.0.jar:lib/org.eclipse.jgit-1.2.0.201112221803-r.jar:lib/parser-common-working@dmdirc-parser-common.jar:lib/parser-irc-working@dmdirc-parser-irc.jar:lib/slf4j-api-1.6.4.jar:lib/util-working@dmdirc-util.jar</classpath>
+                <classpath mode="compile">lib/asm-3.1.jar:lib/gmbal-api-only-3.0.0-b023.jar:lib/grizzly-framework-2.1.2.jar:lib/grizzly-http-2.1.2.jar:lib/grizzly-http-server-2.1.2.jar:lib/grizzly-rcm-2.1.2.jar:lib/hamcrest-core-1.1.jar:lib/ivy-2.2.0.jar:lib/jackson-core-asl-1.9.2.jar:lib/jackson-jaxrs-1.9.2.jar:lib/jackson-mapper-asl-1.9.2.jar:lib/jackson-xc-1.9.2.jar:lib/javax.ws.rs-api-2.0-m01.jar:lib/jersey-grizzly2-1.11.jar:lib/jersey-json-1.11.jar:lib/jersey-server-1.11.jar:lib/jettison-1.1.jar:lib/jgit-describe-0.1.jar:lib/jsch-0.1.44-1.jar:lib/junit-4.10.jar:lib/logback-classic-1.0.0.jar:lib/logback-core-1.0.0.jar:lib/lombok-pg-0.10.8-SNAPSHOT.jar:lib/management-api-3.0.0-b012.jar:lib/mockito-all-1.9.0.jar:lib/org.eclipse.jgit-1.2.0.201112221803-r.jar:lib/parser-common-working@dmdirc-parser-common.jar:lib/parser-irc-working@dmdirc-parser-irc.jar:lib/slf4j-api-1.6.4.jar:lib/stax-api-1.0.1.jar:lib/util-working@dmdirc-util.jar</classpath>
                 <built-to>build</built-to>
                 <source-level>1.7</source-level>
             </compilation-unit>

src/name/smith/chris/restirc/RestIrc.java

@@ -0,0 +1,26 @@
+package name.smith.chris.restirc;
+
+import com.sun.jersey.api.container.grizzly2.GrizzlyServerFactory;
+import com.sun.jersey.api.core.PackagesResourceConfig;
+import com.sun.jersey.api.core.ResourceConfig;
+
+import java.net.URI;
+
+import javax.ws.rs.core.UriBuilder;
+
+/**
+ * Main program entry point. Handles initialisation logic.
+ */
+public class RestIrc {
+
+    private static URI getBaseURI() {
+        return UriBuilder.fromUri("http://localhost/").port(9998).build();
+    }
+
+    public static void main(final String[] args) throws Exception {
+        ResourceConfig rc = new PackagesResourceConfig("name.smith.chris.restirc.resources");
+        GrizzlyServerFactory.createHttpServer(getBaseURI(), rc);
+        System.in.read();
+    }
+
+}

src/name/smith/chris/restirc/resources/VersionResource.java

@@ -0,0 +1,37 @@
+package name.smith.chris.restirc.resources;
+
+import com.dmdirc.util.io.TextFile;
+
+import java.io.IOException;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Response;
+
+/**
+ * Version resource. Simply returns the current version of the application.
+ */
+@Path("/version")
+public class VersionResource {
+
+    /**
+     * Gets the textual representation of the version.
+     *
+     * @return The textual representation of the version.
+     */
+    @GET
+    @Produces("text/plain")
+    public String getVersion() {
+        try {
+            final TextFile textFile = new TextFile(getClass()
+                    .getResourceAsStream("/name/smithc/chris/version"));
+            return textFile.getLines().get(0);
+        } catch (IOException ex) {
+            throw new WebApplicationException(ex,
+                    Response.Status.INTERNAL_SERVER_ERROR);
+        }
+    }
+
+}