sipwise
/
jitsi
mirror of https://github.com/sipwise/jitsi.git
1
0
Fork 0
Code Issues Releases Wiki Activity

felix 1.0.1

Browse Source
cusax-fix
Damian Minkov 18 years ago
parent bf504f6c13
commit 1d4595529e
20 changed files with 46 additions and 29 deletions
Show Stats Download Patch File Download Diff File

4
build.xml
Unescape View File

@ -182,7 +182,7 @@
<fileset dir="${lib}">
<include name="*.jar"/>
<include name="installer-exclude/*.jar"/>
<include name="bundles/*.jar"/>
<include name="bundle/*.jar"/>
</fileset>
<fileset dir="${os.lib.home}">
@ -764,7 +764,7 @@
<!--sysproperty key="net.java.sip.communicator.SC_HOME_DIR_LOCATION"
value="${user.home}"/-->
<!-- Setting properties necessary for dependencies on native libs.-->
<sysproperty key="java.library.path"
path="${ld.library.path}:${path}:${dyld.library.path}"/>

9
ide/nbproject/project.xml
Unescape View File

@ -3,7 +3,7 @@
<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
<!-- Created by Brian Burch on September 27, 2006
The master version is held in CVS, as
/ide/nbproject/project.xml. You should copy it to
/nbproject/project.xml (when NetBeans is not running!)
@ -89,13 +89,14 @@
<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/kxml-min.jar:lib/servicebinder.jar:lib/bundle/junit.jar:lib/bundle/log4j.jar:lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar:lib/installer-exclude/aclibico-2.1.jar:lib/installer-exclude/backport-util-concurrent.jar:lib/installer-exclude/bcprov-jdk14-130.jar:lib/installer-exclude/commons-logging.jar:lib/installer-exclude/concurrent.jar:lib/installer-exclude/dnsjava-2.0.3.jar:lib/installer-exclude/JainSipApi1.2.jar:lib/installer-exclude/JainSipRi1.2.jar:lib/installer-exclude/jcalendar-1.3.2.jar:lib/installer-exclude/jdom.jar:lib/installer-exclude/jmf.jar:lib/installer-exclude/jml-1.0b1.jar:lib/installer-exclude/joscar-client.jar:lib/installer-exclude/joscar-common.jar:lib/installer-exclude/joscar-protocol.jar:lib/installer-exclude/jsocks-klea.jar:lib/installer-exclude/jspeex.jar:lib/installer-exclude/junit.jar:lib/installer-exclude/log4j-1.2.8.jar:lib/installer-exclude/nist-sdp-1.0.jar:lib/installer-exclude/retroweaver-rt-2.0.jar:lib/installer-exclude/rome-0.9.jar:lib/installer-exclude/smack.jar:lib/installer-exclude/smackx-jingle.jar:lib/installer-exclude/smackx.jar:lib/installer-exclude/Stun4J.jar:lib/installer-exclude/xalan-2.6.0.jar.ant:lib/installer-exclude/ymsg_network_v0_61.jar:lib/os-specific/linux/installer-exclude/jmf.jar:lib/os-specific/linux/jdic_stub.jar:lib/os-specific/mac/AppleJavaExtensions.jar:lib/os-specific/mac/growl.jar:lib/os-specific/mac/jdic_stub.jar:lib/os-specific/mac/installer-exclude/jmf.jar:lib/os-specific/windows/installer-exclude/jmf.jar:lib/os-specific/windows/installer-exclude/sound.jar</classpath>
<source-level>1.4</source-level>
<classpath mode="compile">lib/felix.jar:lib/jdic-all.jar:lib/bundle/junit.jar:lib/bundle/log4j.jar:lib/bundle/org.apache.felix.servicebinder-0.9.0-SNAPSHOT.jar:lib/installer-exclude/aclibico-2.1.jar:lib/installer-exclude/backport-util-concurrent.jar:lib/installer-exclude/bcprov-jdk14-130.jar:lib/installer-exclude/commons-logging.jar:lib/installer-exclude/concurrent.jar:lib/installer-exclude/dnsjava-2.0.3.jar:lib/installer-exclude/JainSipApi1.2.jar:lib/installer-exclude/JainSipRi1.2.jar:lib/installer-exclude/jcalendar-1.3.2.jar:lib/installer-exclude/jdom.jar:lib/installer-exclude/jmf.jar:lib/installer-exclude/jml-1.0b1.jar:lib/installer-exclude/joscar-client.jar:lib/installer-exclude/joscar-common.jar:lib/installer-exclude/joscar-protocol.jar:lib/installer-exclude/jsocks-klea.jar:lib/installer-exclude/jspeex.jar:lib/installer-exclude/junit.jar:lib/installer-exclude/log4j-1.2.8.jar:lib/installer-exclude/nist-sdp-1.0.jar:lib/installer-exclude/retroweaver-rt-2.0.jar:lib/installer-exclude/rome-0.9.jar:lib/installer-exclude/smack.jar:lib/installer-exclude/smackx-jingle.jar:lib/installer-exclude/smackx.jar:lib/installer-exclude/Stun4J.jar:lib/installer-exclude/xalan-2.6.0.jar.ant:lib/installer-exclude/ymsg_network_v0_61.jar:lib/os-specific/linux/installer-exclude/jmf.jar:lib/os-specific/linux/jdic_stub.jar:lib/os-specific/mac/AppleJavaExtensions.jar:lib/os-specific/mac/growl.jar:lib/os-specific/mac/jdic_stub.jar:lib/os-specific/mac/installer-exclude/jmf.jar:lib/os-specific/windows/installer-exclude/jmf.jar:lib/os-specific/windows/installer-exclude/sound.jar:lib/installer-exclude/fmj-sc.jar:lib/installer-exclude/pircbot.jar:lib/installer-exclude/jsch-0.1.33.jar</classpath>
<source-level>1.5</source-level>
</compilation-unit>
<compilation-unit>
<package-root>test</package-root>
<unit-tests/>
<source-level>1.4</source-level>
<classpath mode="compile">lib/felix.jar:lib/bundle/junit.jar:classes:lib/installer-exclude/joscar-client.jar:lib/installer-exclude/joscar-common.jar:lib/installer-exclude/joscar-protocol.jar:lib/installer-exclude/smack.jar:lib/installer-exclude/Stun4J.jar</classpath>
<source-level>1.5</source-level>
</compilation-unit>
</java-data>
</configuration>

BIN
lib/bundle/org.apache.felix.bundlerepository-1.0.0.jar
View File

Binary file not shown.

BIN
lib/bundle/org.apache.felix.servicebinder-0.9.0-SNAPSHOT.jar
View File

Binary file not shown.

5
lib/felix.client.run.properties
Unescape View File

@ -1,7 +1,7 @@
#
# Framework config properties.
#
org.osgi.framework.system.packages= org.osgi.framework; \
org.osgi.framework.system.packages= org.osgi.framework; ; version=1.3.0, \
javax.swing; \
javax.swing.event; \
javax.swing.table; \
@ -37,7 +37,8 @@ org.osgi.framework.system.packages= org.osgi.framework; \
com.apple.eio; \
org.xml.sax.helpers;
felix.auto.start.10= reference:file:lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar
felix.auto.start.10= reference:file:lib/bundle/org.apache.felix.bundlerepository-1.0.0.jar \
reference:file:lib/bundle/org.apache.felix.servicebinder-0.9.0-SNAPSHOT.jar
#reference:file:lib/bundle/org.apache.felix.bundlerepository-0.8.0-SNAPSHOT.jar
#\
# file:lib/bundle/shell.jar \

BIN
lib/felix.jar
View File

Binary file not shown.

2
lib/felix.unit.test.properties
Unescape View File

@ -37,7 +37,7 @@ org.osgi.framework.system.packages= org.osgi.framework; \
# file:lib/bundle/tablelayout.jar \
#
felix.auto.start.1= file:lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar \
felix.auto.start.1= file:lib/bundle/org.apache.felix.servicebinder-0.9.0-SNAPSHOT.jar \
file:lib/bundle/junit.jar
# file:lib/bundle/shell.jar \
# file:lib/bundle/bundlerepository.jar \

BIN
lib/kxml-min.jar
View File

Binary file not shown.

BIN
lib/servicebinder.jar
View File

Binary file not shown.

2
resources/install/debian/sip-communicator.sh.tmpl
Unescape View File

@ -32,6 +32,6 @@ cd $SCDIR
if [ -f $javabin ]
then
$javabin -classpath "$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$LIBPATH/kxml-min.jar:$LIBPATH/servicebinder.jar:$LIBPATH/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar:$SCDIR/sc-bundles/util.jar" -Dfelix.config.properties=file:$LIBPATH/felix.client.run.properties -Djava.util.logging.config.file=$LIBPATH/logging.properties org.apache.felix.main.Main
$javabin -classpath "$LIBPATH/jdic_stub.jar:$LIBPATH/jdic-all.jar:$LIBPATH/felix.jar:$SCDIR/sc-bundles/util.jar" -Dfelix.config.properties=file:$LIBPATH/felix.client.run.properties -Djava.util.logging.config.file=$LIBPATH/logging.properties org.apache.felix.main.Main
exit $?
fi

2
resources/install/generic/run.sh
Unescape View File

@ -1,4 +1,4 @@
mkdir -p $HOME/.sip-communicator/log
export PATH=$PATH:native
java -classpath "lib/jdic-all.jar:lib/jdic_stub.jar:lib/felix.jar:lib/kxml-min.jar:lib/servicebinder.jar:lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar:sc-bundles/util.jar" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main
java -classpath "lib/jdic-all.jar:lib/jdic_stub.jar:lib/felix.jar:sc-bundles/util.jar" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main

2
resources/install/linux/run.sh
Unescape View File

@ -2,4 +2,4 @@ mkdir -p $HOME/.sip-communicator/log
export PATH=$PATH:native
export JAVA_HOME=jre
${JAVA_HOME}/bin/java -classpath "lib/jdic-all.jar:lib/jdic_stub.jar:lib/felix.jar:lib/kxml-min.jar:lib/servicebinder.jar:lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar:sc-bundles/util.jar" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main
${JAVA_HOME}/bin/java -classpath "lib/jdic-all.jar:lib/jdic_stub.jar:lib/felix.jar:sc-bundles/util.jar" -Djava.library.path=native -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main

3
resources/install/windows/run.bat
Unescape View File

@ -1,3 +1,4 @@
mkdir "%UserProfile%/.sip-communicator/log"
set PATH=%PATH%;native
start javaw -classpath "lib/jdic-all.jar;lib/jdic_stub.jar;lib/felix.jar;lib/kxml-min.jar;lib/servicebinder.jar;lib/bundle/org.apache.felix.servicebinder-0.8.0-SNAPSHOT.jar;sc-bundles/util.jar" -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main
start javaw -classpath "lib/jdic-all.jar;lib/jdic_stub.jar;lib/felix.jar;sc-bundles/util.jar" -Dfelix.config.properties=file:./lib/felix.client.run.properties -Djava.util.logging.config.file=lib/logging.properties org.apache.felix.main.Main
servicebin

2
src/net/java/sip/communicator/impl/fileaccess/FileAccessActivator.java
Unescape View File

@ -1,6 +1,6 @@
package net.java.sip.communicator.impl.fileaccess;
import org.ungoverned.gravity.servicebinder.*;
import org.apache.felix.servicebinder.GenericActivator;
/**
* Invoke "Service Binder" to parse the service XML and register all services.

1
src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf
Unescape View File

@ -4,6 +4,7 @@ Bundle-Description: A bundle that implements the file access package.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
Import-Package: org.osgi.framework,
org.apache.felix.servicebinder,
org.xml.sax,
org.w3c.dom,
javax.xml.transform,

2
src/net/java/sip/communicator/impl/history/HistoryActivator.java
Unescape View File

@ -6,7 +6,7 @@
*/
package net.java.sip.communicator.impl.history;
import org.ungoverned.gravity.servicebinder.*;
import org.apache.felix.servicebinder.GenericActivator;
/**
* Invoke "Service Binder" to parse the service XML and register all services.

1
src/net/java/sip/communicator/impl/history/history.manifest.mf
Unescape View File

@ -4,6 +4,7 @@ Bundle-Description: A bundle that implements the history package.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
Import-Package: org.osgi.framework,
org.apache.felix.servicebinder,
net.java.sip.communicator.service.configuration,
net.java.sip.communicator.service.fileaccess,
net.java.sip.communicator.service.history,

36
src/net/java/sip/communicator/impl/media/device/JmfDeviceDetector.java
Unescape View File

@ -166,19 +166,29 @@ private void detectCaptureDevices()
}
//Linux
try
{
V4LAuto v4lAuto = new V4LAuto();
nDevices = v4lAuto.autoDetectDevices();
logger.info("Detected "
+ nDevices
+" V4L video capture device.");
}
catch (Throwable exc)
{
logger.debug("No V4l video detected: " + exc.getMessage());
}
// try
// {
// V4LAuto v4lAuto = new V4LAuto();
// nDevices = v4lAuto.autoDetectDevices();
// logger.info("Detected "
// + nDevices
// +" V4L video capture device.");
// }
// catch (Throwable exc)
// {
// logger.debug("No V4l video detected: " + exc.getMessage());
// }
// try
// {
// new net.sf.fmj.media.cdp.civil.CaptureDevicePlugger().
// addCaptureDevices();
// CaptureDeviceManager.commit();
// }
// catch (Throwable exc)
// {
// logger.debug("No civil video detected: ", exc);
// }
}
private void detectDirectAudio()

3
src/net/java/sip/communicator/util/util.manifest.mf
Unescape View File

@ -3,7 +3,8 @@ Bundle-Name: SIP Communicator Utility Packages
Bundle-Description: A bundle that export packages with utility classes.
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
Import-Package: org.w3c.dom,
Import-Package: org.osgi.framework,
org.w3c.dom,
org.xml.sax,
javax.xml.parsers,
org.apache.xml.serialize,

1
test/net/java/sip/communicator/slick/media/media.slick.manifest.mf
Unescape View File

@ -4,6 +4,7 @@ Bundle-Description: A Service Implementation Compatibility Kit for the Media Ser
Bundle-Vendor: sip-communicator.org
Bundle-Version: 0.0.1
Import-Package: org.osgi.framework,
junit.framework,
net.java.sip.communicator.slick.media,
net.java.sip.communicator.service.media,
net.java.sip.communicator.service.media.event,

Write Preview
Loading…
Cancel
Save