Browse Source

Add DMDirc utils

master
Chris Smith 12 years ago
parent
commit
2854e3618b
3 changed files with 13 additions and 6 deletions
  1. 5
    0
      etc/ivy/ivysettings.xml
  2. 1
    0
      ivy.xml
  3. 7
    6
      nbproject/project.xml

+ 5
- 0
etc/ivy/ivysettings.xml View File

22
             <artifact pattern="http://teamcity.dmdirc.com/guestAuth/repository/download/bt9/.lastSuccessful/parser.common.jar"/>
22
             <artifact pattern="http://teamcity.dmdirc.com/guestAuth/repository/download/bt9/.lastSuccessful/parser.common.jar"/>
23
         </url>
23
         </url>
24
 
24
 
25
+        <url name="dmdirc-util">
26
+            <artifact pattern="http://teamcity.dmdirc.com/guestAuth/repository/download/bt7/.lastSuccessful/util.jar"/>
27
+        </url>
28
+
25
         <packager name="packager" buildRoot="${user.home}/.ivy2/packager/build" resourceCache="${user.home}/.ivy2/packager/cache" preserveBuildDirectories="true">
29
         <packager name="packager" buildRoot="${user.home}/.ivy2/packager/build" resourceCache="${user.home}/.ivy2/packager/cache" preserveBuildDirectories="true">
26
             <ivy pattern="file:///${basedir}/etc/ivy/[module]/ivy.xml"/>
30
             <ivy pattern="file:///${basedir}/etc/ivy/[module]/ivy.xml"/>
27
             <artifact pattern="file:///${basedir}/etc/ivy/[module]/packager.xml"/>
31
             <artifact pattern="file:///${basedir}/etc/ivy/[module]/packager.xml"/>
34
         <module organisation="com.sun.*" name="*" resolver="java"/>
38
         <module organisation="com.sun.*" name="*" resolver="java"/>
35
         <module organisation="com.dmdirc" name="parser-common" resolver="dmdirc-parser-common"/>
39
         <module organisation="com.dmdirc" name="parser-common" resolver="dmdirc-parser-common"/>
36
         <module organisation="com.dmdirc" name="parser-irc" resolver="dmdirc-parser-irc"/>
40
         <module organisation="com.dmdirc" name="parser-irc" resolver="dmdirc-parser-irc"/>
41
+        <module organisation="com.dmdirc" name="util" resolver="dmdirc-util"/>
37
     </modules>
42
     </modules>
38
 </ivysettings>
43
 </ivysettings>

+ 1
- 0
ivy.xml View File

19
         <dependency org="com.sun.jersey" name="jersey-server" rev="1.12-SNAPSHOT" conf="compile->default"/>
19
         <dependency org="com.sun.jersey" name="jersey-server" rev="1.12-SNAPSHOT" conf="compile->default"/>
20
         <dependency org="com.dmdirc" name="parser-common" rev="latest.integration" conf="compile->default"/>
20
         <dependency org="com.dmdirc" name="parser-common" rev="latest.integration" conf="compile->default"/>
21
         <dependency org="com.dmdirc" name="parser-irc" rev="latest.integration" conf="compile->default"/>
21
         <dependency org="com.dmdirc" name="parser-irc" rev="latest.integration" conf="compile->default"/>
22
+        <dependency org="com.dmdirc" name="util" rev="latest.integration" conf="compile->default"/>
22
 
23
 
23
         <dependency org="junit" name="junit" rev="4.+" conf="test->default" />
24
         <dependency org="junit" name="junit" rev="4.+" conf="test->default" />
24
         <dependency org="org.mockito" name="mockito-all" rev="1.+" conf="test->default" />
25
         <dependency org="org.mockito" name="mockito-all" rev="1.+" conf="test->default" />

+ 7
- 6
nbproject/project.xml View File

10
             <name>RestIRC</name>
10
             <name>RestIRC</name>
11
             <properties/>
11
             <properties/>
12
             <folders>
12
             <folders>
13
+                <source-folder>
14
+                    <label>RestIRC</label>
15
+                    <location>.</location>
16
+                    <encoding>UTF-8</encoding>
17
+                </source-folder>
13
                 <source-folder>
18
                 <source-folder>
14
                     <label>src</label>
19
                     <label>src</label>
15
                     <type>java</type>
20
                     <type>java</type>
22
                     <location>test</location>
27
                     <location>test</location>
23
                     <encoding>UTF-8</encoding>
28
                     <encoding>UTF-8</encoding>
24
                 </source-folder>
29
                 </source-folder>
25
-                <source-folder>
26
-                    <label>RestIRC</label>
27
-                    <location>.</location>
28
-                    <encoding>UTF-8</encoding>
29
-                </source-folder>
30
             </folders>
30
             </folders>
31
             <ide-actions>
31
             <ide-actions>
32
                 <action name="build">
32
                 <action name="build">
65
                     <ide-action name="clean"/>
65
                     <ide-action name="clean"/>
66
                 </context-menu>
66
                 </context-menu>
67
             </view>
67
             </view>
68
+            <subprojects/>
68
         </general-data>
69
         </general-data>
69
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3">
70
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3">
70
             <compilation-unit>
71
             <compilation-unit>
71
                 <package-root>src</package-root>
72
                 <package-root>src</package-root>
72
-                <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</classpath>
73
+                <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>
73
                 <built-to>build</built-to>
74
                 <built-to>build</built-to>
74
                 <source-level>1.7</source-level>
75
                 <source-level>1.7</source-level>
75
             </compilation-unit>
76
             </compilation-unit>

Loading…
Cancel
Save