Ant working locally. Copied JUnit .jars into project.

This commit is contained in:
Winston Li 2014-11-02 19:57:55 +00:00
parent abe140c9e7
commit 5c2e461b2b
12 changed files with 154 additions and 100 deletions

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="AntConfiguration"> <component name="AntConfiguration">
<buildFile url="file://$PROJECT_DIR$/build.xml" /> <buildFile url="file://$PROJECT_DIR$/writelatex-git-bridge.xml" />
</component> </component>
</project> </project>

View file

@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="hamcrest-core-1.3">
<CLASSES>
<root url="jar://$PROJECT_DIR$/libs/hamcrest-core-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

View file

@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="hamcrest-library-1.3">
<CLASSES>
<root url="jar://$PROJECT_DIR$/libs/hamcrest-library-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

View file

@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="junit-4.11">
<CLASSES>
<root url="jar://$PROJECT_DIR$/libs/junit-4.11.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

View file

@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="0c822a5a-f421-4f3c-b941-5c2809c4546f" name="Default" comment="" /> <list default="true" id="0c822a5a-f421-4f3c-b941-5c2809c4546f" name="Default" comment="">
<change type="DELETED" beforePath="$PROJECT_DIR$/build.xml" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/writelatex-git-bridge.properties" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeApplicationTests.java" afterPath="$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeApplicationTests.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/ant.xml" afterPath="$PROJECT_DIR$/.idea/ant.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/writelatex-git-bridge.iml" afterPath="$PROJECT_DIR$/writelatex-git-bridge.iml" />
</list>
<ignored path="writelatex-git-bridge.iws" /> <ignored path="writelatex-git-bridge.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
@ -26,18 +33,38 @@
<file leaf-file-name="writelatex-git-bridge.iml" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="writelatex-git-bridge.iml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/writelatex-git-bridge.iml"> <entry file="file://$PROJECT_DIR$/writelatex-git-bridge.iml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="510"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
<caret line="28" column="0" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" /> <caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="writelatex-git-bridge.properties" pinned="false" current="true" current-in-tab="true"> <file leaf-file-name="WLGitBridgeApplicationTests.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/writelatex-git-bridge.properties"> <entry file="file://$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeApplicationTests.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.052878965" vertical-offset="0" max-vertical-offset="851"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
<caret line="3" column="47" selection-start-line="3" selection-start-column="47" selection-end-line="3" selection-end-column="47" /> <caret line="12" column="30" selection-start-line="12" selection-start-column="26" selection-end-line="12" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="WLGitBridgeServerTests.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeServerTests.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.26439482" vertical-offset="0" max-vertical-offset="851">
<caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="writelatex-git-bridge.xml" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/writelatex-git-bridge.xml">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-19.692308" vertical-offset="3463" max-vertical-offset="4305">
<caret line="265" column="45" selection-start-line="265" selection-start-column="45" selection-end-line="265" selection-end-column="45" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -53,16 +80,6 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="WLGitServletTests.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/git/WLGitServletTests.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="195" max-vertical-offset="315">
<caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="WLReceivePackFactoryTests.java" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="WLReceivePackFactoryTests.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/git/WLReceivePackFactoryTests.java"> <entry file="file://$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/git/WLReceivePackFactoryTests.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
@ -126,8 +143,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="changedFiles"> <option name="changedFiles">
<list> <list>
<option value="$PROJECT_DIR$/writelatex-git-bridge.iml" />
<option value="$PROJECT_DIR$/writelatex-git-bridge.xml" />
<option value="$PROJECT_DIR$/src/uk/ac/ic/WritelatexRepositoryResolver.java" /> <option value="$PROJECT_DIR$/src/uk/ac/ic/WritelatexRepositoryResolver.java" />
<option value="$PROJECT_DIR$/src/uk/ac/ic/WGBServer.java" /> <option value="$PROJECT_DIR$/src/uk/ac/ic/WGBServer.java" />
<option value="$PROJECT_DIR$/test/uk/ac/ic/test/WGBServerTests.java" /> <option value="$PROJECT_DIR$/test/uk/ac/ic/test/WGBServerTests.java" />
@ -161,10 +176,15 @@
<option value="$PROJECT_DIR$/test/uk/ac/ic/test/MainTests.java" /> <option value="$PROJECT_DIR$/test/uk/ac/ic/test/MainTests.java" />
<option value="$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/MainTests.java" /> <option value="$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/MainTests.java" />
<option value="$PROJECT_DIR$/writelatex-git-bridge.properties" /> <option value="$PROJECT_DIR$/writelatex-git-bridge.properties" />
<option value="$PROJECT_DIR$/build.xml" />
<option value="$PROJECT_DIR$/writelatex-git-bridge.iml" />
<option value="$PROJECT_DIR$/writelatex-git-bridge.xml" />
<option value="$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeApplicationTests.java" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds"> <component name="ProjectFrameBounds">
<option name="x" value="2" />
<option name="y" value="23" /> <option name="y" value="23" />
<option name="width" value="2559" /> <option name="width" value="2559" />
<option name="height" value="1413" /> <option name="height" value="1413" />
@ -202,6 +222,10 @@
<option name="myItemId" value="writelatex-git-bridge" /> <option name="myItemId" value="writelatex-git-bridge" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="External Libraries" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
</PATH_ELEMENT>
</PATH> </PATH>
<PATH> <PATH>
<PATH_ELEMENT> <PATH_ELEMENT>
@ -368,11 +392,11 @@
<property name="project.structure.proportion" value="0.15" /> <property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" /> <property name="project.structure.side.proportion" value="0.2" />
<property name="GenerateAntBuildDialog.generateSingleFile" value="true" /> <property name="GenerateAntBuildDialog.generateSingleFile" value="true" />
<property name="GenerateAntBuildDialog.enableUiFormCompile" value="true" /> <property name="GenerateAntBuildDialog.enableUiFormCompile" value="false" />
<property name="GenerateAntBuildDialog.forceTargetJdk" value="true" /> <property name="GenerateAntBuildDialog.forceTargetJdk" value="true" />
<property name="GenerateAntBuildDialog.backupFiles" value="false" /> <property name="GenerateAntBuildDialog.backupFiles" value="false" />
<property name="GenerateAntBuildDialog.inclineRuntiemClasspath" value="true" /> <property name="GenerateAntBuildDialog.inclineRuntiemClasspath" value="false" />
<property name="GenerateAntBuildDialog.generateIdeaHomeProperty" value="true" /> <property name="GenerateAntBuildDialog.generateIdeaHomeProperty" value="false" />
<property name="GenerateAntBuildDialog.outputFileNameProperty" value="writelatex-git-bridge" /> <property name="GenerateAntBuildDialog.outputFileNameProperty" value="writelatex-git-bridge" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/writelatex-git-bridge.xml" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/writelatex-git-bridge.xml" />
<property name="recentsLimit" value="5" /> <property name="recentsLimit" value="5" />
@ -386,13 +410,13 @@
<key name="CopyFile.RECENT_KEYS"> <key name="CopyFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/libs" /> <recent name="$PROJECT_DIR$/libs" />
</key> </key>
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/libs" />
</key>
<key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
<recent name="uk.ac.ic.wlgitbridge" /> <recent name="uk.ac.ic.wlgitbridge" />
<recent name="uk.ac.ic" /> <recent name="uk.ac.ic" />
</key> </key>
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/libs" />
</key>
</component> </component>
<component name="RunManager" selected="Application.writelatex-git-bridge"> <component name="RunManager" selected="Application.writelatex-git-bridge">
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin"> <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
@ -599,7 +623,7 @@
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="2559" height="1413" extended-state="6" /> <frame x="2" y="23" width="2559" height="1413" extended-state="6" />
<editor active="false" /> <editor active="false" />
<layout> <layout>
<window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@ -607,7 +631,7 @@
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="true" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24970692" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24970692" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
@ -618,7 +642,7 @@
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13325518" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13325518" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16443452" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16443452" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Documentation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" x="100" y="123" width="1166" height="541" /> <window_info id="Documentation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="FLOATING" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" x="100" y="123" width="1166" height="541" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@ -650,19 +674,11 @@
<component name="antWorkspaceConfiguration"> <component name="antWorkspaceConfiguration">
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
<buildFile url="file://$PROJECT_DIR$/build.xml"> <buildFile url="file://$PROJECT_DIR$/writelatex-git-bridge.xml">
<expanded value="true" /> <expanded value="true" />
</buildFile> </buildFile>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/uk/ac/ic/wlgitbridge/application/WLGitBridgeApplication.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="345" max-vertical-offset="480">
<caret line="23" column="5" selection-start-line="23" selection-start-column="5" selection-end-line="23" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeApplicationTests.java"> <entry file="file://$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeApplicationTests.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="195" max-vertical-offset="315"> <state vertical-scroll-proportion="0.0" vertical-offset="195" max-vertical-offset="315">
@ -949,22 +965,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeServerTests.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
<caret line="7" column="37" selection-start-line="7" selection-start-column="37" selection-end-line="12" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeApplicationTests.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
<caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/git/WLGitServletConfigTests.java"> <entry file="file://$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/git/WLGitServletConfigTests.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
@ -1031,16 +1031,32 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/writelatex-git-bridge.iml"> <entry file="file://$PROJECT_DIR$/writelatex-git-bridge.iml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="510"> <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
<caret line="28" column="0" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" /> <caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/writelatex-git-bridge.properties"> <entry file="file://$PROJECT_DIR$/writelatex-git-bridge.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.052878965" vertical-offset="0" max-vertical-offset="851"> <state vertical-scroll-proportion="-19.692308" vertical-offset="3463" max-vertical-offset="4305">
<caret line="3" column="47" selection-start-line="3" selection-start-column="47" selection-end-line="3" selection-end-column="47" /> <caret line="265" column="45" selection-start-line="265" selection-start-column="45" selection-end-line="265" selection-end-column="45" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeApplicationTests.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
<caret line="12" column="30" selection-start-line="12" selection-start-column="26" selection-end-line="12" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/uk/ac/ic/wlgitbridge/test/application/WLGitBridgeServerTests.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.26439482" vertical-offset="0" max-vertical-offset="851">
<caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>

View file

@ -96,6 +96,14 @@
<!-- Project Libraries --> <!-- Project Libraries -->
<path id="library.hamcrest-core-1.3.classpath">
<pathelement location="${basedir}/libs/hamcrest-core-1.3.jar"/>
</path>
<path id="library.hamcrest-library-1.3.classpath">
<pathelement location="${basedir}/libs/hamcrest-library-1.3.jar"/>
</path>
<path id="library.javax.servlet-api-3.1.0.classpath"> <path id="library.javax.servlet-api-3.1.0.classpath">
<pathelement location="${basedir}/libs/javax.servlet-api-3.1.0.jar"/> <pathelement location="${basedir}/libs/javax.servlet-api-3.1.0.jar"/>
</path> </path>
@ -104,6 +112,10 @@
<pathelement location="${basedir}/libs/jetty-all-9.2.3.v20140905.jar"/> <pathelement location="${basedir}/libs/jetty-all-9.2.3.v20140905.jar"/>
</path> </path>
<path id="library.junit-4.11.classpath">
<pathelement location="${basedir}/libs/junit-4.11.jar"/>
</path>
<path id="library.org.eclipse.jgit-3.5.1.201410131835-r.classpath"> <path id="library.org.eclipse.jgit-3.5.1.201410131835-r.classpath">
<pathelement location="${basedir}/libs/org.eclipse.jgit-3.5.1.201410131835-r.jar"/> <pathelement location="${basedir}/libs/org.eclipse.jgit-3.5.1.201410131835-r.jar"/>
</path> </path>
@ -111,18 +123,6 @@
<path id="library.org.eclipse.jgit.http.server-3.5.1.201410131835-r.classpath"> <path id="library.org.eclipse.jgit.http.server-3.5.1.201410131835-r.classpath">
<pathelement location="${basedir}/libs/org.eclipse.jgit.http.server-3.5.1.201410131835-r.jar"/> <pathelement location="${basedir}/libs/org.eclipse.jgit.http.server-3.5.1.201410131835-r.jar"/>
</path> </path>
<!-- Register Custom Compiler Taskdefs -->
<property name="javac2.home" value="${idea.home}/lib"/>
<path id="javac2.classpath">
<pathelement location="${javac2.home}/javac2.jar"/>
<pathelement location="${javac2.home}/jdom.jar"/>
<pathelement location="${javac2.home}/asm4-all.jar"/>
<pathelement location="${javac2.home}/jgoodies-forms.jar"/>
</path>
<target name="register.custom.compilers">
<taskdef name="javac2" classname="com.intellij.ant.Javac2" classpathref="javac2.classpath"/>
<taskdef name="instrumentIdeaExtensions" classname="com.intellij.ant.InstrumentIdeaExtensions" classpathref="javac2.classpath"/>
</target>
<!-- Modules --> <!-- Modules -->
@ -151,6 +151,9 @@
<path refid="library.org.eclipse.jgit.http.server-3.5.1.201410131835-r.classpath"/> <path refid="library.org.eclipse.jgit.http.server-3.5.1.201410131835-r.classpath"/>
<path refid="library.javax.servlet-api-3.1.0.classpath"/> <path refid="library.javax.servlet-api-3.1.0.classpath"/>
<path refid="library.jetty-all-9.2.3.v20140905.classpath"/> <path refid="library.jetty-all-9.2.3.v20140905.classpath"/>
<path refid="library.hamcrest-core-1.3.classpath"/>
<path refid="library.hamcrest-library-1.3.classpath"/>
<path refid="library.junit-4.11.classpath"/>
</path> </path>
<path id="writelatex-git-bridge.runtime.production.module.classpath"> <path id="writelatex-git-bridge.runtime.production.module.classpath">
@ -159,6 +162,9 @@
<path refid="library.org.eclipse.jgit.http.server-3.5.1.201410131835-r.classpath"/> <path refid="library.org.eclipse.jgit.http.server-3.5.1.201410131835-r.classpath"/>
<path refid="library.javax.servlet-api-3.1.0.classpath"/> <path refid="library.javax.servlet-api-3.1.0.classpath"/>
<path refid="library.jetty-all-9.2.3.v20140905.classpath"/> <path refid="library.jetty-all-9.2.3.v20140905.classpath"/>
<path refid="library.hamcrest-core-1.3.classpath"/>
<path refid="library.hamcrest-library-1.3.classpath"/>
<path refid="library.junit-4.11.classpath"/>
</path> </path>
<path id="writelatex-git-bridge.module.classpath"> <path id="writelatex-git-bridge.module.classpath">
@ -168,9 +174,9 @@
<path refid="library.org.eclipse.jgit.http.server-3.5.1.201410131835-r.classpath"/> <path refid="library.org.eclipse.jgit.http.server-3.5.1.201410131835-r.classpath"/>
<path refid="library.javax.servlet-api-3.1.0.classpath"/> <path refid="library.javax.servlet-api-3.1.0.classpath"/>
<path refid="library.jetty-all-9.2.3.v20140905.classpath"/> <path refid="library.jetty-all-9.2.3.v20140905.classpath"/>
<pathelement location="${idea.home}/lib/hamcrest-core-1.3.jar"/> <path refid="library.hamcrest-core-1.3.classpath"/>
<pathelement location="${idea.home}/lib/hamcrest-library-1.3.jar"/> <path refid="library.hamcrest-library-1.3.classpath"/>
<pathelement location="${idea.home}/lib/junit-4.11.jar"/> <path refid="library.junit-4.11.classpath"/>
</path> </path>
<path id="writelatex-git-bridge.runtime.module.classpath"> <path id="writelatex-git-bridge.runtime.module.classpath">
@ -180,9 +186,9 @@
<path refid="library.org.eclipse.jgit.http.server-3.5.1.201410131835-r.classpath"/> <path refid="library.org.eclipse.jgit.http.server-3.5.1.201410131835-r.classpath"/>
<path refid="library.javax.servlet-api-3.1.0.classpath"/> <path refid="library.javax.servlet-api-3.1.0.classpath"/>
<path refid="library.jetty-all-9.2.3.v20140905.classpath"/> <path refid="library.jetty-all-9.2.3.v20140905.classpath"/>
<pathelement location="${idea.home}/lib/hamcrest-core-1.3.jar"/> <path refid="library.hamcrest-core-1.3.classpath"/>
<pathelement location="${idea.home}/lib/hamcrest-library-1.3.jar"/> <path refid="library.hamcrest-library-1.3.classpath"/>
<pathelement location="${idea.home}/lib/junit-4.11.jar"/> <path refid="library.junit-4.11.classpath"/>
</path> </path>
@ -209,15 +215,15 @@
<target name="compile.module.writelatex-git-bridge" depends="compile.module.writelatex-git-bridge.production,compile.module.writelatex-git-bridge.tests" description="Compile module writelatex-git-bridge"/> <target name="compile.module.writelatex-git-bridge" depends="compile.module.writelatex-git-bridge.production,compile.module.writelatex-git-bridge.tests" description="Compile module writelatex-git-bridge"/>
<target name="compile.module.writelatex-git-bridge.production" depends="register.custom.compilers" description="Compile module writelatex-git-bridge; production classes"> <target name="compile.module.writelatex-git-bridge.production" description="Compile module writelatex-git-bridge; production classes">
<mkdir dir="${writelatex-git-bridge.output.dir}"/> <mkdir dir="${writelatex-git-bridge.output.dir}"/>
<javac2 destdir="${writelatex-git-bridge.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true" executable="${module.jdk.bin.writelatex-git-bridge}/javac"> <javac destdir="${writelatex-git-bridge.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true" executable="${module.jdk.bin.writelatex-git-bridge}/javac">
<compilerarg line="${compiler.args.writelatex-git-bridge}"/> <compilerarg line="${compiler.args.writelatex-git-bridge}"/>
<bootclasspath refid="writelatex-git-bridge.module.bootclasspath"/> <bootclasspath refid="writelatex-git-bridge.module.bootclasspath"/>
<classpath refid="writelatex-git-bridge.module.production.classpath"/> <classpath refid="writelatex-git-bridge.module.production.classpath"/>
<src refid="writelatex-git-bridge.module.sourcepath"/> <src refid="writelatex-git-bridge.module.sourcepath"/>
<patternset refid="excluded.from.compilation.writelatex-git-bridge"/> <patternset refid="excluded.from.compilation.writelatex-git-bridge"/>
</javac2> </javac>
<copy todir="${writelatex-git-bridge.output.dir}"> <copy todir="${writelatex-git-bridge.output.dir}">
<fileset dir="${module.writelatex-git-bridge.basedir}/src"> <fileset dir="${module.writelatex-git-bridge.basedir}/src">
@ -227,15 +233,15 @@
</copy> </copy>
</target> </target>
<target name="compile.module.writelatex-git-bridge.tests" depends="register.custom.compilers,compile.module.writelatex-git-bridge.production" description="compile module writelatex-git-bridge; test classes" unless="skip.tests"> <target name="compile.module.writelatex-git-bridge.tests" depends="compile.module.writelatex-git-bridge.production" description="compile module writelatex-git-bridge; test classes" unless="skip.tests">
<mkdir dir="${writelatex-git-bridge.testoutput.dir}"/> <mkdir dir="${writelatex-git-bridge.testoutput.dir}"/>
<javac2 destdir="${writelatex-git-bridge.testoutput.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true" executable="${module.jdk.bin.writelatex-git-bridge}/javac"> <javac destdir="${writelatex-git-bridge.testoutput.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true" executable="${module.jdk.bin.writelatex-git-bridge}/javac">
<compilerarg line="${compiler.args.writelatex-git-bridge}"/> <compilerarg line="${compiler.args.writelatex-git-bridge}"/>
<bootclasspath refid="writelatex-git-bridge.module.bootclasspath"/> <bootclasspath refid="writelatex-git-bridge.module.bootclasspath"/>
<classpath refid="writelatex-git-bridge.module.classpath"/> <classpath refid="writelatex-git-bridge.module.classpath"/>
<src refid="writelatex-git-bridge.module.test.sourcepath"/> <src refid="writelatex-git-bridge.module.test.sourcepath"/>
<patternset refid="excluded.from.compilation.writelatex-git-bridge"/> <patternset refid="excluded.from.compilation.writelatex-git-bridge"/>
</javac2> </javac>
<copy todir="${writelatex-git-bridge.testoutput.dir}"> <copy todir="${writelatex-git-bridge.testoutput.dir}">
<fileset dir="${module.writelatex-git-bridge.basedir}/test"> <fileset dir="${module.writelatex-git-bridge.basedir}/test">
@ -254,7 +260,21 @@
<!-- Perform any build initialization in this target --> <!-- Perform any build initialization in this target -->
</target> </target>
<target name="clean" depends="clean.module.writelatex-git-bridge" description="cleanup all"/> <target name="test" depends="compile.module.writelatex-git-bridge.tests">
<junit>
<classpath>
<path refid="writelatex-git-bridge.module.classpath"/>
<pathelement location="${writelatex-git-bridge.testoutput.dir}"/>
</classpath>
<batchtest>
<fileset dir="${writelatex-git-bridge.testoutput.dir}">
</fileset>
</batchtest>
<formatter type="brief" usefile="false"/>
</junit>
</target>
<target name="clean" depends="clean.module.writelatex-git-bridge" description="cleanup all"/>
<target name="build.modules" depends="init, clean, compile.module.writelatex-git-bridge" description="build all modules"/> <target name="build.modules" depends="init, clean, compile.module.writelatex-git-bridge" description="build all modules"/>

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -1,6 +1,7 @@
package uk.ac.ic.wlgitbridge.test.application; package uk.ac.ic.wlgitbridge.test.application;
import org.junit.Test; import org.junit.Test;
import org.junit.Assert;
/** /**
* Created by Winston on 02/11/14. * Created by Winston on 02/11/14.
@ -9,7 +10,7 @@ public class WLGitBridgeApplicationTests {
@Test @Test
public void nothingToTest() { public void nothingToTest() {
Assert.assertTrue(true);
} }
} }

View file

@ -12,17 +12,9 @@
<orderEntry type="library" name="org.eclipse.jgit.http.server-3.5.1.201410131835-r" level="project" /> <orderEntry type="library" name="org.eclipse.jgit.http.server-3.5.1.201410131835-r" level="project" />
<orderEntry type="library" name="javax.servlet-api-3.1.0" level="project" /> <orderEntry type="library" name="javax.servlet-api-3.1.0" level="project" />
<orderEntry type="library" name="jetty-all-9.2.3.v20140905" level="project" /> <orderEntry type="library" name="jetty-all-9.2.3.v20140905" level="project" />
<orderEntry type="module-library" scope="TEST"> <orderEntry type="library" name="hamcrest-core-1.3" level="project" />
<library name="JUnit4"> <orderEntry type="library" name="hamcrest-library-1.3" level="project" />
<CLASSES> <orderEntry type="library" name="junit-4.11" level="project" />
<root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.11.jar!/" />
<root url="jar://$APPLICATION_HOME_DIR$/lib/hamcrest-core-1.3.jar!/" />
<root url="jar://$APPLICATION_HOME_DIR$/lib/hamcrest-library-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component> </component>
</module> </module>

View file

@ -1,4 +1,2 @@
path.variable.maven_repository=/Users/Roxy/.m2/repository path.variable.maven_repository=/Users/Roxy/.m2/repository
jdk.home.1.7=/Library/Java/JavaVirtualMachines/jdk1.7.0_60.jdk/Contents/Home jdk.home.1.7=/Library/Java/JavaVirtualMachines/jdk1.7.0_60.jdk/Contents/Home
idea.home=/Applications/IntelliJ IDEA 13 CE.app
javac2.instrumentation.includeJavaRuntime=false