Move IDE project files to where they are expected by the respective IDE

3 files changed, 311 insertions, 0 deletions

diff --git a/nbproject/ide-file-targets.xml b/nbproject/ide-file-targets.xml
new file mode 100644
index 0000000..7f325d2
--- /dev/null
+++ b/nbproject/ide-file-targets.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created by Brian Burch on October 8, 2008
+     Netbeans debug targets are now held in this file.
+    -->
+<project basedir=".." name="SIP Communicator-IDE">
+
+    <import file="../build.xml"/>
+
+    <target name="debug-selected-file-in-test"
+            depends="prepare-local-accounts,prepare-all-tests,deploy-os-specific-bundles"
+            description="Starts felix and debugs the selected Service Impl Compatibility Kit" >
+        <!-- This target runs felix under the debugger, but it can only work with
+             unit test classes that extend TestSuite and implements BundleActivator
+             e.g. GibberishProtocolProviderServiceLick -->
+
+        <!-- if 'test.name' property is not defined, we will be
+             runing all tests defined in testing.properties. -->
+
+        <!-- we allow users to pass command line args using the "args" system
+             property. However we need to manually set tha prop to an empty
+             string here or otherwise the application would get an argument with
+             the value ${args}-->
+        <property name="args" value=""/>
+
+        <nbjpdastart name="${short.test.name}"
+                     addressproperty="jpda.address"
+                     transport="dt_socket" >
+            <classpath refid="debug.class.path" />
+            <sourcepath refid="project.source.path" />
+        </nbjpdastart>
+
+        <!-- fork=true no longer prevents debug break points latching... -->
+        <java fork="true"
+              classname="org.apache.felix.main.Main"
+              resultproperty="test.result.code"
+              failonerror="true" >
+
+            <classpath refid="debug.class.path"/>
+            <jvmarg value="-Xdebug"/>
+            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+
+            <!-- Tell felix to run as a test environment-->
+            <sysproperty key="felix.config.properties"
+                         value="file:${lib}/felix.unit.test.properties"/>
+
+            <!-- Tell the slick runner where to store test results. -->
+            <sysproperty key="net.java.sip.communicator.slick.runner.OUTPUT_DIR"
+                         value="${test.reports.dir}"/>
+
+            <!-- Tell the slick runner which Test classes to run. -->
+            <sysproperty key="net.java.sip.communicator.slick.runner.TEST_LIST"
+                         value="${net.java.sip.communicator.slick.runner.TEST_LIST}"/>
+
+            <!-- use a meta contact list file different to normal client. -->
+            <sysproperty key="net.java.sip.communicator.CONTACTLIST_FILE_NAME"
+                         value="net.java.sip.communicator.CONTACTLIST_FILE_NAME"/>
+            <!-- use a configuration file different to normal client. -->
+            <sysproperty key="net.java.sip.communicator.CONFIGURATION_FILE_NAME"
+                         value="net.java.sip.communicator.CONFIGURATION_FILE_NAME"/>
+
+            <!-- Tell java.util.logging about our logging preferences -->
+            <sysproperty key="java.util.logging.config.file"
+                value="${lib}/logging.properties"/>
+
+            <!-- Tell all protocol testers their account details. -->
+            <syspropertyset id="accounts">
+              <propertyref prefix="accounts"/>
+              <propertyref prefix="net"/>
+            </syspropertyset>
+
+            <sysproperty key="java.net.preferIPv6Addresses"
+                value="false"/>
+        </java>
+
+        <!-- Generate the html junit report.
+             Run it quietly (i.e. redirect the output) because we don't won't to
+             see its "Build Successful" output line as users might confuse it
+             for a general build success while this might not be the case.-->
+        <echo message="Generating single test report ..."/>
+        <java fork="true"
+              classname="org.apache.tools.ant.launch.Launcher"
+              classpath="${java.class.path}:${lib.noinst}/xalan-2.6.0.jar.ant"
+              failonerror="true"
+              output="${test.html.reports.dir}/output.txt">
+            <arg value="htmlreport"/>
+        </java>
+        <echo message="Done."/>
+        <echo/><echo/>
+        <echo message="Test results available in ./test-reports/html/index.html "/>
+        <echo/>
+
+        <!-- Check whether testing went alright and fail if not.-->
+        <condition property="testing.failed">
+          <not>
+            <equals arg1="0"
+            arg2="${test.result.code}"
+            casesensitive="false" trim="true"/>
+          </not>
+        </condition>
+        <fail if="testing.failed"/>
+    </target>
+
+</project>
+
diff --git a/nbproject/ide-targets.xml b/nbproject/ide-targets.xml
new file mode 100644
index 0000000..fa47782
--- /dev/null
+++ b/nbproject/ide-targets.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Created by Brian Burch on August 25, 2005
+     Netbeans debug targets are now held in this file.
+    -->
+<project basedir=".." name="SIP Communicator-IDE">
+
+    <import file="../build.xml"/>
+
+    <target name="debug-nb-wholeApp"
+            depends="deploy-os-specific-bundles"
+            description="Starts felix and runs sip-comunicator gui (use latest build).">
+        <nbjpdastart addressproperty="jpda.address"
+                     name="SIP Communicator"
+                     transport="dt_socket">
+            <classpath  refid="debug.class.path"/>
+            <sourcepath refid="project.source.path"/>
+        </nbjpdastart>
+
+        <!-- we allow users to pass command line args using the "args" system
+             property. However we need to manually set that prop to an empty
+             string here (in the normal case the user will not have defined
+             any - otherwise the application would find an argument with
+             the value ${args} )-->
+        <property name="args" value="--multiple"/>
+
+        <!-- fork=true no longer prevents debug break points latching... -->
+        <java fork="true"
+              classname="net.java.sip.communicator.launcher.SIPCommunicator"
+              failonerror="true">
+            <classpath  refid="debug.class.path"/>
+
+            <jvmarg value="-Xdebug"/>
+            <jvmarg value="-Xnoagent"/>
+            <jvmarg value="-Djava.compiler=none"/>
+            <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
+
+            <!-- Sets the charset for the messages -->
+            <!--sysproperty key="icq.custom.message.charset" value="windows-1252"/-->
+            <!-- Tell felix to run sip-communicator-->
+            <sysproperty key="felix.config.properties"
+                         value="file:${lib}/felix.client.run.properties"/>
+
+            <!-- Tell java.util.logging about our logging preferences -->
+            <sysproperty key="java.util.logging.config.file"
+                         value="${lib}/logging.properties"/>
+
+            <sysproperty key="java.net.preferIPv6Addresses"
+                         value="false"/>
+
+            <!--sysproperty key="net.java.sip.communicator.SC_HOME_DIR_LOCATION"
+                    value="${user.home}/schome"/-->
+
+            <!-- Setting properties necessary for dependencies on native libs.-->
+            <sysproperty key="java.library.path"
+                         path="${ld.library.path}:${path}:${dyld.library.path}"/>
+
+            <!-- pass l10n properties from ant call for
+                 easy translation debugging -->
+            <sysproperty key="user.language" value="${user.language}"/>
+            <sysproperty key="user.country" value="${user.country}"/>
+            <sysproperty key="user.variant" value="${user.variant}"/>
+
+            <env key="LD_LIBRARY_PATH" path="${ld.library.path}"/>
+            <env key="PATH" path="${path}"/>
+            <env key="DYLD_LIBRARY_PATH" path="${dyld.library.path}"/>
+
+            <!-- make sure that we automatically enable system.out when running
+                 SIP Communicator from Ant-->
+            <arg line="--debug"/>
+            <!-- pass to SC args that have been specified by the user -->
+            <arg line="${args}"/>
+        </java>
+    </target>
+
+</project>
diff --git a/nbproject/project.xml b/nbproject/project.xml
new file mode 100644
index 0000000..19c926e
--- /dev/null
+++ b/nbproject/project.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.ant.freeform</type>
+    <configuration>
+        <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
+            <!-- Created by Brian Burch on September 27, 2006
+              ** Updated by Brian Burch on October 22, 2008
+                 Netbeans debug targets are now held in 
+                 ./nbproject/ide-targets.xml and ./nbproject/ide-file-targets.xml.
+                 -->
+            <name>jitsi</name>
+            <properties/>
+            <folders>
+                <source-folder>
+                    <label>src</label>
+                    <type>java</type>
+                    <location>src</location>
+                </source-folder>
+                <source-folder>
+                    <label>test</label>
+                    <type>java</type>
+                    <location>test</location>
+                </source-folder>
+            </folders>
+            <ide-actions>
+                <action name="build">
+                    <target>make</target>
+                </action>
+                <action name="clean">
+                    <target>clean</target>
+                </action>
+                <action name="javadoc">
+                    <target>javadoc</target>
+                </action>
+                <action name="run">
+                    <target>run</target>
+                </action>
+                <action name="test">
+                    <target>test</target>
+                </action>
+                <action name="rebuild">
+                    <target>rebuild</target>
+                </action>
+                <action name="run.single">
+                    <target>test</target>
+                    <context>
+                        <property>test.name</property>
+                        <folder>test</folder>
+                        <pattern>\.java$</pattern>
+                        <format>relative-path-noext</format>
+                        <arity>
+                            <one-file-only/>
+                        </arity>
+                    </context>
+                </action>
+                <action name="debug.single">
+                    <script>nbproject/ide-file-targets.xml</script>
+                    <target>debug-selected-file-in-test</target>
+                    <context>
+                        <property>test.name</property>
+                        <folder>test</folder>
+                        <pattern>\.java$</pattern>
+                        <format>relative-path-noext</format>
+                        <arity>
+                            <one-file-only/>
+                        </arity>
+                    </context>
+                </action>
+            </ide-actions>
+            <export>
+                <type>folder</type>
+                <location>classes</location>
+                <build-target>make</build-target>
+            </export>
+            <export>
+                <type>folder</type>
+                <location>classes</location>
+                <build-target>make</build-target>
+            </export>
+            <view>
+                <items>
+                    <source-folder style="packages">
+                        <label>src</label>
+                        <location>src</location>
+                    </source-folder>
+                    <source-folder style="packages">
+                        <label>test</label>
+                        <location>test</location>
+                    </source-folder>
+                    <source-file>
+                        <location>build.xml</location>
+                    </source-file>
+                </items>
+                <context-menu>
+                    <ide-action name="build"/>
+                    <ide-action name="clean"/>
+                    <ide-action name="javadoc"/>
+                    <ide-action name="run"/>
+                    <ide-action name="test"/>
+                    <ide-action name="rebuild"/>
+                    <ide-action name="run.multiple"/>
+                    <action>
+                        <script>nbproject/ide-targets.xml</script>
+                        <label>Debug Application</label>
+                        <target>debug-nb-wholeApp</target>
+                    </action>
+                    <action>
+                        <script>nbproject/ide-file-targets.xml</script>
+                        <label>Debug all tests</label>
+                        <target>debug-selected-file-in-test</target>
+                    </action>
+                </context-menu>
+            </view>
+            <subprojects/>
+        </general-data>
+        <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2">
+            <compilation-unit>
+                <package-root>src</package-root>
+                <classpath mode="compile">lib/felix.jar:lib/jdic-all.jar:lib/bundle/commons-logging.jar:lib/bundle/junit.jar:lib/bundle/log4j.jar:lib/installer-exclude/aclibico-2.1.jar:lib/installer-exclude/apache-ant-1.7.0.jar:lib/installer-exclude/concurrent.jar:lib/installer-exclude/dhcp4java-1.00.jar:lib/installer-exclude/dict4j.jar:lib/installer-exclude/dnsjava.jar:lib/installer-exclude/fmj.jar:lib/installer-exclude/forms-1.2.1.jar:lib/installer-exclude/gdata-client-1.0.jar:lib/installer-exclude/gdata-client-meta-1.0.jar:lib/installer-exclude/gdata-contacts-3.0.jar:lib/installer-exclude/gdata-contacts-meta-3.0.jar:lib/installer-exclude/gdata-core-1.0.jar:lib/installer-exclude/google-collect-1.0-rc1.jar:lib/installer-exclude/httpclient-4.1.2.jar:lib/installer-exclude/httpcore-4.1.2.jar:lib/installer-exclude/httpmime-4.1.2.jar:lib/installer-exclude/ice4j.jar:lib/installer-exclude/jain-sdp.jar:lib/installer-exclude/jain-sip-api.jar:lib/installer-exclude/jain-sip-ri.jar:lib/installer-exclude/jcalendar-1.3.2.jar:lib/installer-exclude/jdic_misc.jar:lib/installer-exclude/jdom.jar:lib/installer-exclude/jfontchooser-1.0.5.jar:lib/installer-exclude/jmdns.jar:lib/installer-exclude/jmf.jar:lib/installer-exclude/jml-1.0b5.jar:lib/installer-exclude/jmyspell-core.jar:lib/installer-exclude/jna.jar:lib/installer-exclude/jnsapi.jar:lib/installer-exclude/joscar-client.jar:lib/installer-exclude/joscar-common.jar:lib/installer-exclude/joscar-protocol.jar:lib/installer-exclude/jsch-0.1.36.jar:lib/installer-exclude/jsocks-klea.jar:lib/installer-exclude/json-20090723.jar:lib/installer-exclude/jspeex.jar:lib/installer-exclude/junit.jar:lib/installer-exclude/laf-widget.jar:lib/installer-exclude/lcrypto-jdk16-143.jar:lib/installer-exclude/libphonenumber-2.4.jar:lib/installer-exclude/log4j-1.2.8.jar:lib/installer-exclude/lti-civil-no_s_w_t.jar:lib/installer-exclude/mac_widgets-0.9.5.jar:lib/installer-exclude/nist-sdp-1.0.jar:lib/installer-exclude/otr4j.jar:lib/installer-exclude/pircbot.jar:lib/installer-exclude/profiler4j-1.0-beta3-SC.jar:lib/installer-exclude/rome-0.9.jar:lib/installer-exclude/smack.jar:lib/installer-exclude/smackx.jar:lib/installer-exclude/swing-worker-1.2.jar:lib/installer-exclude/transparency.jar:lib/installer-exclude/weupnp-0.1.2-SNAPSHOT.jar:lib/installer-exclude/ymsg_network_v0_67.jar:lib/installer-exclude/zrtp4j-light.jar:lib/os-specific/linux/installer-exclude/jmf.jar:lib/os-specific/linux/jdic_stub.jar:lib/os-specific/mac/growl4j.jar:lib/os-specific/mac/jdic_stub.jar:lib/os-specific/mac/OrangeExtensions.jar:lib/os-specific/mac/installer-exclude/dock.jar:lib/os-specific/mac/installer-exclude/jmf.jar:lib/os-specific/solaris/jdic_stub.jar:lib/os-specific/solaris/installer-exclude/jmf.jar:lib/os-specific/windows/jdic_stub.jar:lib/os-specific/windows/installer-exclude/jmf.jar:lib/os-specific/windows/installer-exclude/jna-platform-win32.jar:lib/os-specific/windows/installer-exclude/sound.jar:lib/installer-exclude/libdbus-java-2.7.jar:lib/installer-exclude/hexdump-0.2.jar:lib/installer-exclude/unix-0.5.jar:lib/installer-exclude/sdes4j.jar</classpath>
+                <built-to>classes</built-to>
+                <source-level>1.5</source-level>
+            </compilation-unit>
+            <compilation-unit>
+                <package-root>test</package-root>
+                <unit-tests/>
+                <classpath mode="compile">classes:lib/felix.jar:lib/bundle/junit.jar:lib/installer-exclude/joscar-client.jar:lib/installer-exclude/joscar-common.jar:lib/installer-exclude/joscar-protocol.jar:lib/installer-exclude/smack.jar</classpath>
+                <built-to>classes</built-to>
+                <source-level>1.5</source-level>
+            </compilation-unit>
+        </java-data>
+    </configuration>
+</project>